Author: veithen
Date: Sun May 15 14:34:37 2011
New Revision: 1103399
URL: http://svn.apache.org/viewvc?rev=1103399&view=rev
Log:
Cleanly rolled back the changes in the local transport to the version before
2011-05-10 (so that we can later reapply them properly by merging from the
branch):
$ svn merge -c -1103313,-1103312,-1101884,-1101493,-1101488,-1101328 . .
--- Reverse-merging r1103313 into '.':
A
modules/transport/local/src/org/apache/axis2/transport/local/NonBlockingLocalTransportSender.java
--- Reverse-merging r1103312 into '.':
U
modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java
U
modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
U
modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
--- Reverse-merging r1101884 into '.':
D
modules/transport/local/src/org/apache/axis2/transport/local/NonBlockingLocalTransportSender.java
--- Reverse-merging r1101493 into '.':
G
modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java
G
modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
G
modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
--- Reverse-merging r1101488 into '.':
U
modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
--- Reverse-merging r1101328 into '.':
G
modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java?rev=1103399&r1=1103398&r2=1103399&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Sun May 15 14:34:37 2011
@@ -28,11 +28,9 @@ import org.apache.axis2.addressing.Endpo
import org.apache.axis2.builder.BuilderUtil;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.SessionContext;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.transport.TransportListener;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.util.MessageContextBuilder;
@@ -106,11 +104,6 @@ public class LocalTransportReceiver {
msgCtx.setTransportOut(localTransportResOut);
msgCtx.setProperty(MessageContext.TRANSPORT_OUT, response);
- Object headers =
inMessageContext.getProperty(MessageContext.TRANSPORT_HEADERS);
- if (headers != null) {
- msgCtx.setProperty(MessageContext.TRANSPORT_HEADERS, headers);
- }
-
msgCtx.setTo(to);
msgCtx.setWSAAction(action);
msgCtx.setServerSide(true);
@@ -142,28 +135,4 @@ public class LocalTransportReceiver {
}
}
}
-
- public void init(ConfigurationContext axisConf, TransportInDescription
transprtIn) throws AxisFault {
- }
-
- public void start() throws AxisFault {
- }
-
- public void stop() throws AxisFault {
- }
-
- public EndpointReference getEPRForService(String serviceName, String ip)
throws AxisFault {
- return null;
- }
-
- public EndpointReference[] getEPRsForService(String serviceName, String
ip) throws AxisFault {
- return new EndpointReference[0];
- }
-
- public SessionContext getSessionContext(MessageContext messageContext) {
- return null;
- }
-
- public void destroy() {
- }
}