[jbossws-commits] JBossWS SVN: r10327 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/soap.

Author: alessio.soldano(a)jboss.com Date: 2009-07-16 09:14:53 -0400 (Thu, 16 Jul 2009) New Revision: 10327 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java Log: [JBWS-2632] Preventing NPE Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2009-07-16 12:50:54 UTC (rev 10326) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2009-07-16 13:14:53 UTC (rev 10327) @@ -44,6 +44,7 @@ import javax.xml.ws.addressing.soap.SOAPAddressingBuilder; import javax.xml.ws.addressing.soap.SOAPAddressingProperties; +import org.jboss.logging.Logger; import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.soap.SOAPFactoryImpl; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; @@ -67,6 +68,8 @@ */ public class SOAPAddressingPropertiesImpl extends AddressingPropertiesImpl implements SOAPAddressingProperties { + private static Logger log = Logger.getLogger(SOAPAddressingBuilderImpl.class); + private static AddressingConstants ADDR = new AddressingConstantsImpl(); private NamespaceRegistry nsRegistry = new NamespaceRegistry(); @@ -222,6 +225,12 @@ SOAPFactoryImpl factory = (SOAPFactoryImpl)SOAPFactory.newInstance(); SOAPHeader soapHeader = message.getSOAPHeader(); + if (soapHeader == null) + { + log.warn("No SOAP headers found!"); + return; + } + // Add the xmlns:wsa declaration soapHeader.addNamespaceDeclaration(ADDR.getNamespacePrefix(), ADDR.getNamespaceURI());