You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2006/10/28 05:05:07 UTC

svn commit: r468620 - in /webservices/axis2/branches/java/1_1/modules: adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java kernel/src/org/apache/axis2/AxisFault.java

Author: dims
Date: Fri Oct 27 20:05:06 2006
New Revision: 468620

URL: http://svn.apache.org/viewvc?view=rev&rev=468620
Log:
Fix for AXIS2-1533 - FaultCode is not set in the AxisFault object

Modified:
    webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/AxisFault.java

Modified: webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?view=diff&rev=468620&r1=468619&r2=468620
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java (original)
+++ webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java Fri Oct 27 20:05:06 2006
@@ -139,14 +139,18 @@
             outMessage.setEnvelope(envelope);
         } catch (InvocationTargetException e) {
             String msg = null;
-            if (e.getCause() != null) {
-                msg = e.getCause().getMessage();
+            Throwable cause = e.getCause();
+            if (cause != null) {
+                msg = cause.getMessage();
             }
             if (msg == null) {
                 msg = "Exception occurred while trying to invoke service method " +
                         method.getName();
             }
             log.error(msg, e);
+            if(cause instanceof AxisFault) {
+                throw (AxisFault)cause;
+            }
             throw new AxisFault(msg);
         } catch (Exception e) {
             String msg = "Exception occurred while trying to invoke service method " +

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/AxisFault.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/AxisFault.java?view=diff&rev=468620&r1=468619&r2=468620
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/AxisFault.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/AxisFault.java Fri Oct 27 20:05:06 2006
@@ -164,6 +164,9 @@
 
         }
 
+        if(soapFaultCode != null && soapFaultCode.getValue() != null) {
+            faultCode = soapFaultCode.getValue().getTextAsQName();
+        }
     }
 
     private void setToElementsListIfNotNull(String soapFaultElementName, OMElement soapFaultElement) {



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org