geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1087973 - /geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java
Date Sat, 02 Apr 2011 08:45:29 GMT
Author: xuhaihong
Date: Sat Apr  2 08:45:29 2011
New Revision: 1087973

URL: http://svn.apache.org/viewvc?rev=1087973&view=rev
Log:
NPE fix for AxisBuilder, need to find a way avoid the duplicate webservice.xml analysis for
both jax-rpc and jax-ws

Modified:
    geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java

Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java?rev=1087973&r1=1087972&r2=1087973&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java
(original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java
Sat Apr  2 08:45:29 2011
@@ -301,7 +301,7 @@ public class WSDescriptorParser {
         SharedPortInfo sharedPortInfo;
         for (WebserviceDescription webserviceDescription : webserviceDescriptions) {
             String wsdlLocation = webserviceDescription.getWsdlFile().trim();
-            String jaxrpcMappingFile = webserviceDescription.getJaxrpcMappingFile().trim();
+            String jaxrpcMappingFile = webserviceDescription.getJaxrpcMappingFile() == null
? "" : webserviceDescription.getJaxrpcMappingFile().trim();
 
             sharedPortInfo = new SharedPortInfo(wsdlLocation,
                                                 jaxrpcMappingFile,



Mime
View raw message