You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2008/06/20 21:53:58 UTC

svn commit: r670048 - in /synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport: base/AbstractTransportListener.java base/AbstractTransportSender.java nhttp/ClientWorker.java

Author: veithen
Date: Fri Jun 20 12:53:58 2008
New Revision: 670048

URL: http://svn.apache.org/viewvc?rev=670048&view=rev
Log:
Code cleanup: use static methods from AxisEngine in a static context (Note: the AxisEngine contructor is a no-op).

Modified:
    synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportListener.java
    synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportSender.java
    synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientWorker.java

Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportListener.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportListener.java?rev=670048&r1=670047&r2=670048&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportListener.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportListener.java Fri Jun 20 12:53:58 2008
@@ -49,8 +49,6 @@
 
     /** the axis2 configuration context */
     protected ConfigurationContext cfgCtx = null;
-    /** an axis2 engine over the above configuration context to process messages */
-    protected AxisEngine engine = null;
 
     /** transport in description */
     private TransportInDescription  transportIn  = null;
@@ -91,7 +89,6 @@
         throws AxisFault {
         
         this.cfgCtx = cfgCtx;
-        this.engine = new AxisEngine(cfgCtx);
         this.transportIn  = transportIn;
         this.transportOut = cfgCtx.getAxisConfiguration().getTransportOut(getTransportName());
 
@@ -275,14 +272,14 @@
         // send the message context through the axis engine
         try {
                 try {
-                    engine.receive(msgCtx);
+                    AxisEngine.receive(msgCtx);
                 } catch (AxisFault e) {
                     e.printStackTrace();
                     if (log.isDebugEnabled()) {
                         log.debug("Error receiving message", e);
                     }
                     if (msgCtx.isServerSide()) {
-                        engine.sendFault(MessageContextBuilder.createFaultMessageContext(msgCtx, e));
+                        AxisEngine.sendFault(MessageContextBuilder.createFaultMessageContext(msgCtx, e));
                     }
                 }
         } catch (AxisFault axisFault) {

Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportSender.java?rev=670048&r1=670047&r2=670048&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportSender.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportSender.java Fri Jun 20 12:53:58 2008
@@ -38,8 +38,6 @@
 import javax.management.ObjectName;
 import java.util.Map;
 import java.util.Set;
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
 
 public abstract class AbstractTransportSender extends AbstractHandler implements TransportSender {
 
@@ -48,8 +46,6 @@
 
     /** the axis2 configuration context */
     protected ConfigurationContext cfgCtx = null;
-    /** an axis2 engine over the above configuration context to process messages */
-    protected AxisEngine engine = null;
     /** transport in description */
     private TransportInDescription transportIn  = null;
     /** transport out description */
@@ -71,7 +67,6 @@
     public void init(ConfigurationContext cfgCtx, TransportOutDescription transportOut)
         throws AxisFault {
         this.cfgCtx = cfgCtx;
-        this.engine = new AxisEngine(cfgCtx);
         this.transportOut = transportOut;
         this.transportIn  = cfgCtx.getAxisConfiguration().getTransportIn(getTransportName());
         this.state = BaseConstants.STARTED;
@@ -142,13 +137,13 @@
         // send the message context through the axis engine
         try {
                 try {
-                    engine.receive(msgCtx);
+                    AxisEngine.receive(msgCtx);
                 } catch (AxisFault e) {
                     if (log.isDebugEnabled()) {
                         log.debug("Error receiving message", e);
                     }
                     if (msgCtx.isServerSide()) {
-                        engine.sendFault(MessageContextBuilder.createFaultMessageContext(msgCtx, e));
+                        AxisEngine.sendFault(MessageContextBuilder.createFaultMessageContext(msgCtx, e));
                     }
                 }
         } catch (AxisFault axisFault) {

Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientWorker.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientWorker.java?rev=670048&r1=670047&r2=670048&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientWorker.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientWorker.java Fri Jun 20 12:53:58 2008
@@ -195,9 +195,8 @@
             responseMsgCtx.setProperty(NhttpConstants.NON_BLOCKING_TRANSPORT, true);
 
             // process response received
-            AxisEngine engine = new AxisEngine(cfgCtx);
             try {
-                engine.receive(responseMsgCtx);
+                AxisEngine.receive(responseMsgCtx);
             } catch (AxisFault af) {
                 log.error("Fault processing response message through Axis2", af);
             }