svn commit: r1005887 - /axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java

[scheu]

Author: scheu
Date: Fri Oct  8 16:35:19 2010
New Revision: 1005887

URL: http://svn.apache.org/viewvc?rev=1005887&view=rev
Log:
AXIS2-4839
Contributor: Brian De Pradine
Committer: Rich Scheuerle

I changed Brian's commit slightly to remove the possibility of an NPE.

Modified:
    
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java

Modified: 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java?rev=1005887&r1=1005886&r2=1005887&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
 Fri Oct  8 16:35:19 2010
@@ -534,6 +534,10 @@ class OperationDescriptionImpl
                     log.debug("Default faultAction = "+faultAction);
                 }
                 
+                if (log.isDebugEnabled()) {
+                    log.debug("Default faultAction = "+faultAction);
+                }
+                
                 
newAxisOperation.addFaultAction(faultDesc.getExceptionClassName(),  
faultAction);
                 newAxisOperation.setFaultMessages(faultMessage);
             }
@@ -563,19 +567,18 @@ class OperationDescriptionImpl
                     }
                     FaultDescription faultDesc = 
resolveFaultByExceptionName(className);
                     if (faultDesc != null)  {
-                        
                         String faultActionString = faultAction.value();
                         if (log.isDebugEnabled()) {
-                            log.debug("SANDERKA: faultAction value = 
"+faultActionString);
+                            log.debug("faultAction value = 
"+faultActionString);
                         }
-                        
-                        if (faultActionString.equals("")) {
+
+                        if (faultActionString == null || 
faultActionString.equals("")) {
                             faultActionString = 
                                 
WSDL11ActionHelper.getFaultActionFromStringInformation( targetNS, 
-                                                portTypeName, 
-                                                operationName, 
-                                                
className.substring((className.lastIndexOf('.'))+1));
-                            
+                                        portTypeName, 
+                                        operationName, 
+                                        
className.substring((className.lastIndexOf('.'))+1));
+
                             if (log.isDebugEnabled()) {
                                 log.debug("New faultAction value = 
"+faultActionString);
                             }