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

[scheu]

Author: scheu
Date: Fri Nov  5 14:34:46 2010
New Revision: 1031588

URL: http://svn.apache.org/viewvc?rev=1031588&view=rev
Log:
AXIS2-4872
Contributor: Katherine Sanders
Correct default fault action when other fault actions are overridden in the 
@Action annotation

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=1031588&r1=1031587&r2=1031588&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 Nov  5 14:34:46 2010
@@ -522,7 +522,17 @@ class OperationDescriptionImpl
         
                 AxisMessage faultMessage = new AxisMessage();
                 String faultName = faultDesc.getName();
+                
+                if (faultName == null || faultName.equals("")) {
+                    faultName = faultDesc.getExceptionClassName();
+                    // Remove package name to get just class name
+                    faultName = 
faultName.substring((faultName.lastIndexOf('.'))+1);
+                }
+                
                 faultMessage.setName(faultName);
+                if (log.isDebugEnabled()) {
+                    log.debug("Set faultName = "+faultName+" for faultMessage 
= "+faultMessage+" and faultDesc = "+faultDesc);
+                }
                 
                 String faultAction = 
                         
WSDL11ActionHelper.getFaultActionFromStringInformation( targetNS, 
@@ -534,10 +544,6 @@ class OperationDescriptionImpl
                     log.debug("Default faultAction = "+faultAction);
                 }
                 
-                if (log.isDebugEnabled()) {
-                    log.debug("Default faultAction = "+faultAction);
-                }
-                
                 
newAxisOperation.addFaultAction(faultDesc.getExceptionClassName(),  
faultAction);
                 newAxisOperation.setFaultMessages(faultMessage);
             }
@@ -572,18 +578,9 @@ class OperationDescriptionImpl
                             log.debug("faultAction value = 
"+faultActionString);
                         }
 
-                        if (faultActionString == null || 
faultActionString.equals("")) {
-                            faultActionString = 
-                                
WSDL11ActionHelper.getFaultActionFromStringInformation( targetNS, 
-                                        portTypeName, 
-                                        operationName, 
-                                        
className.substring((className.lastIndexOf('.'))+1));
-
-                            if (log.isDebugEnabled()) {
-                                log.debug("New faultAction value = 
"+faultActionString);
-                            }
+                        if (faultActionString != null && 
!faultActionString.equals("")) {
+                            newAxisOperation.addFaultAction(className, 
faultActionString);
                         }
-                        newAxisOperation.addFaultAction(className, 
faultActionString);
                     }
                 }
             }