Author: alessio.soldano(a)jboss.com Date: 2008-12-23 11:04:54 -0500 (Tue, 23 Dec 2008) New Revision: 8958 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java Log: Prevent exception when SOAPHandler.getHeaders() return null Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2008-12-19 17:39:19 UTC (rev 8957) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2008-12-23 16:04:54 UTC (rev 8958) @@ -502,7 +502,11 @@ for (Handler bindingHandler : binding.getHandlerChain(type)) { if (bindingHandler instanceof SOAPHandler) - headers.addAll(((SOAPHandler)bindingHandler).getHeaders()); + { + Set<QName> understoodHeaders = ((SOAPHandler)bindingHandler).getHeaders(); + if (understoodHeaders != null) + headers.addAll(understoodHeaders); + } } }