[jboss-svn-commits] JBL Code SVN: r24878 - labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise.

[jboss-svn-commits at lists.jboss.org]

Author: maeste
Date: 2009-01-22 11:56:31 -0500 (Thu, 22 Jan 2009)
New Revision: 24878

Modified:
   labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SOAPClient.java
Log:
removed a NPE introduced in one of my previous commits adding catalog support

Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SOAPClient.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SOAPClient.java	2009-01-22 16:16:36 UTC (rev 24877)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SOAPClient.java	2009-01-22 16:56:31 UTC (rev 24878)
@@ -246,7 +246,10 @@
                 File bindFile = new File(fileName);
                 bindings.add(bindFile);
             }
-            File catalog = new File(catalogFileName);
+            File catalog = null;
+            if (catalogFileName != null) {
+                catalog = new File(catalogFileName);
+            }
             client = WSDynamicClientFactory.getInstance().getJAXWSClient(wsdl,
                                                                          username,
                                                                          password,
@@ -335,11 +338,10 @@
         InvocationResult result = null;
         try {
             WSMethod wsMethod = getMethod();
-            if (wsMethod == null)
-            {
+            if (wsMethod == null) {
                 throw new ActionProcessingException("No WsMethod found for " + this.soapAction);
             }
-            
+
             result = wsMethod.invoke(params, requestMapper);
         } catch (Exception e) {
             e.printStackTrace();