Author: thomas.diesler(a)jboss.com Date: 2007-03-16 18:02:41 -0400 (Fri, 16 Mar 2007) New Revision: 2633 Modified: trunk/build/ant.properties.example trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyImpl.java Log: Fix NPE in SOAPBodyImpl with Provider Modified: trunk/build/ant.properties.example =================================================================== --- trunk/build/ant.properties.example 2007-03-16 20:40:00 UTC (rev 2632) +++ trunk/build/ant.properties.example 2007-03-16 22:02:41 UTC (rev 2633) @@ -9,7 +9,7 @@ #jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 # The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat] -jbossws.integration.target=jboss42 +jbossws.integration.target=jboss50 # The JBoss server instance jboss.server.instance=default Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-03-16 20:40:00 UTC (rev 2632) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-03-16 22:02:41 UTC (rev 2633) @@ -218,7 +218,6 @@ public SOAPFault getFault() { log.trace("getFault"); - expandToDOM(true); Iterator it = faultIterator(); SOAPFault soapFault = it.hasNext() ? (SOAPFault)it.next() : null; return soapFault; @@ -232,6 +231,7 @@ private Iterator faultIterator() { + expandToDOM(true); return getChildElements(new QName(getNamespaceURI(), "Fault")); } @@ -335,7 +335,7 @@ if (msgContext != null && UnifiedMetaData.isFinalRelease() == false) { Boolean allowExpand = (Boolean)msgContext.getProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM); - if (handleFault == false && allowExpand == false) + if (handleFault == false && allowExpand != Boolean.TRUE) throw new WSException("Expanding content element to DOM"); }