You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by am...@apache.org on 2011/02/28 10:08:15 UTC

svn commit: r1075243 - in /axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local: LocalResponder.java LocalTransportReceiver.java LocalTransportSender.java

Author: amilas
Date: Mon Feb 28 09:08:14 2011
New Revision: 1075243

URL: http://svn.apache.org/viewvc?rev=1075243&view=rev
Log:
appliying the patch for AXIS2-4961

Modified:
    axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
    axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
    axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java

Modified: axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java?rev=1075243&r1=1075242&r2=1075243&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java Mon Feb 28 09:08:14 2011
@@ -175,6 +175,27 @@ public class LocalResponder extends Abst
         inMessageContext.setTransportIn(initialMessageContext.getTransportIn());
         inMessageContext.setTransportOut(initialMessageContext.getTransportOut());
 
+        if (log.isDebugEnabled()) {
+            log.debug("Setting AxisServiceGroup - " + initialMessageContext.getAxisServiceGroup());
+            log.debug("Setting AxisService - " + initialMessageContext.getAxisService());
+            log.debug("Setting AxisOperation - " + initialMessageContext.getAxisOperation());
+            log.debug("Setting AxisMessage - " + initialMessageContext.getAxisOperation().
+                    getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE));
+            log.debug("Setting Incoming Transport name - " + Constants.TRANSPORT_LOCAL);
+            log.debug("Setting Service Context " + initialMessageContext.getServiceGroupContext().toString());
+
+            log.debug("Setting ServerSide to true");
+            log.debug("Setting " + MessageContext.TRANSPORT_OUT + " property to " +
+                    initialMessageContext.getProperty(MessageContext.TRANSPORT_OUT));
+            log.debug("Setting " + Constants.OUT_TRANSPORT_INFO + " property to " +
+                    initialMessageContext.getProperty(Constants.OUT_TRANSPORT_INFO));
+            log.debug("Setting TransportIn - " + initialMessageContext.getTransportIn());
+            log.debug("Setting TransportOut - " + initialMessageContext.getTransportOut());
+
+            log.debug("Setting ReplyTo - " + initialMessageContext.getReplyTo());
+            log.debug("Setting FaultTo - " + initialMessageContext.getFaultTo());
+        }
+
         // copy the message type property that is used by the out message to the response message
         inMessageContext.setProperty(Constants.Configuration.MESSAGE_TYPE,
                 initialMessageContext.getProperty(Constants.Configuration.MESSAGE_TYPE));

Modified: axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java?rev=1075243&r1=1075242&r2=1075243&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Mon Feb 28 09:08:14 2011
@@ -33,6 +33,8 @@ import org.apache.axis2.description.Tran
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.axis2.util.MessageContextBuilder;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import javax.xml.stream.XMLStreamException;
 import java.io.InputStream;
@@ -40,6 +42,7 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 
 public class LocalTransportReceiver {
+    protected static final Log log = LogFactory.getLog(LocalTransportReceiver.class);
     public static ConfigurationContext CONFIG_CONTEXT;
     private ConfigurationContext confContext;
     private MessageContext inMessageContext;
@@ -90,16 +93,25 @@ public class LocalTransportReceiver {
         MessageContext msgCtx = confContext.createMessageContext();
 
         if (this.nonBlocking) {
+            if (log.isDebugEnabled()) {
+                log.debug("Setting the in-message context as a property(" + IN_MESSAGE_CONTEXT +
+                        ") to the current message context");
+            }
             // Set the in-message context as a property to the  current message context.
             msgCtx.setProperty(IN_MESSAGE_CONTEXT, inMessageContext);
         }
 
         if (inMessageContext != null) {
+            if (log.isDebugEnabled()) {
+                log.debug("Setting the property " + HTTPConstants.MC_HTTP_SERVLETREQUEST + " to " +
+                        inMessageContext.getProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST));
+                log.debug("Setting the property " + MessageContext.REMOTE_ADDR + " to " +
+                        inMessageContext.getProperty(MessageContext.REMOTE_ADDR));
+            }
             msgCtx.setProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST,
                                inMessageContext.getProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST));
             msgCtx.setProperty(MessageContext.REMOTE_ADDR,
                                inMessageContext.getProperty(MessageContext.REMOTE_ADDR));
-
         }
 
         TransportInDescription tIn = confContext.getAxisConfiguration().getTransportIn(
@@ -134,6 +146,15 @@ public class LocalTransportReceiver {
 
             msgCtx.setEnvelope(envelope);
 
+             if (log.isDebugEnabled()) {
+                log.debug("Setting incoming Transport name - " + Constants.TRANSPORT_LOCAL);
+                log.debug("Setting TransportIn - " + tIn);
+                log.debug("Setting TransportOut - " + localTransportResOut);
+                log.debug("Setting To address - " + to);
+                log.debug("Setting WSAction - " + action);
+                log.debug("Setting Envelope - " + envelope.toString());
+            }
+
             AxisEngine.receive(msgCtx);
         } catch (AxisFault e) {
             // write the fault back.
@@ -143,6 +164,10 @@ public class LocalTransportReceiver {
                 faultContext.setTransportOut(localTransportResOut);
                 faultContext.setProperty(MessageContext.TRANSPORT_OUT, response);
 
+                if(log.isDebugEnabled()) {
+                    log.debug("Setting FaultContext's TransportOut - " + localTransportResOut);
+                }
+
                 AxisEngine.sendFault(faultContext);
             } catch (AxisFault axisFault) {
                 // can't handle this, so just throw it

Modified: axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java?rev=1075243&r1=1075242&r2=1075243&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java Mon Feb 28 09:08:14 2011
@@ -113,6 +113,9 @@ public class LocalTransportSender extend
     }
 
     protected boolean isNonBlocking() {
+        if (log.isDebugEnabled()) {
+            log.debug("Local Transport Sender Selected");
+        }
         return false;
     }
 }