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/02/08 06:39:27 UTC

svn commit: r375862 - in /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2: AxisFault.java Constants.java engine/AxisEngine.java

Author: dims
Date: Tue Feb  7 21:39:26 2006
New Revision: 375862

URL: http://svn.apache.org/viewcvs?rev=375862&view=rev
Log:
- add yet another constructor to AxisFault :)
- Copy TRANSPORT_OUT if the faultTo is anonymous as well not jsut when it is not set.


Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/AxisFault.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/AxisFault.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/AxisFault.java?rev=375862&r1=375861&r2=375862&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/AxisFault.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/AxisFault.java Tue Feb  7 21:39:26 2006
@@ -137,6 +137,15 @@
     }
 
     /**
+     * @param messageText - this will appear as the Text in the Reason information item of SOAP Fault
+     * @param faultCode   - this will appear as the Value in the Code information item of SOAP Fault
+     */
+    public AxisFault(String messageText, QName faultCode) {
+        this(messageText);
+        setFaultCode(faultCode);
+    }
+
+    /**
      * @param message
      * @param cause
      */

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java?rev=375862&r1=375861&r2=375862&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java Tue Feb  7 21:39:26 2006
@@ -185,7 +185,7 @@
     //to set and get the property from service context
     public static final String COOKIE_STRING = "Cookie";
 
-    //See
+    public static final String NS_URI_AXIS2 = "http://ws.apache.org/axis2/";
 
     /**
      * Addressing Constants

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=375862&r1=375861&r2=375862&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java Tue Feb  7 21:39:26 2006
@@ -19,6 +19,8 @@
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.OperationContext;
@@ -137,12 +139,14 @@
         faultContext.setTransportOut(processingContext.getTransportOut());
 
         faultContext.setProcessingFault(true);
-
-        if (processingContext.getFaultTo() != null) {
+        EndpointReference faultTo = processingContext.getFaultTo();
+        if (faultTo != null) {
             faultContext.setFaultTo(processingContext.getFaultTo());
-        } else {
+        } 
+        
+        if (faultTo == null || AddressingConstants.Final.WSA_ANONYMOUS_URL.equals(faultTo.getAddress())
+                    || AddressingConstants.Submission.WSA_ANONYMOUS_URL.equals(faultTo.getAddress())) {
             Object writer = processingContext.getProperty(MessageContext.TRANSPORT_OUT);
-
             if (writer != null) {
                 faultContext.setProperty(MessageContext.TRANSPORT_OUT, writer);
             } else {