Author: heiko.braun(a)jboss.com Date: 2007-03-20 06:42:55 -0400 (Tue, 20 Mar 2007) New Revision: 2646 Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java Log: Fix NPE in legacy serviceRef parser Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2007-03-20 09:37:42 UTC (rev 2645) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2007-03-20 10:42:55 UTC (rev 2646) @@ -87,15 +87,16 @@ QName portName = portNameString!=null ? QName.valueOf(portNameString) : null; UnifiedPortComponentRefMetaData pcref = sref.getPortComponentRef(seiName, portName); - if (pcref == null) + /*if (pcref == null) { // Its ok to only have the <port-component-ref> in jboss.xml and not in ejb-jar.xml pcref = new UnifiedPortComponentRefMetaData(sref); pcref.importStandardXml(pcrefElement); sref.addPortComponentRef(pcref); - } - pcref.importJBossXml(pcrefElement); + } */ + if(pcref!=null) pcref.importJBossXml(pcrefElement); + } // Parse the call-property elements