[axis-axis2-java-transports] 05/46: Partial refactoring to get the WSCOMMONS-444 fixed (it requires synapse changes as well)

[billblough]

This is an automated email from the ASF dual-hosted git repository.

billblough pushed a commit to branch transport
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-transports.git

commit fd314be72c3f01b0f0bbe75d45e49f69dbb3de74
Author: Ruwan Linton <ru...@apache.org>
AuthorDate: Wed Sep 23 03:05:20 2009 +0000

    Partial refactoring to get the WSCOMMONS-444 fixed (it requires synapse 
changes as well)
---
 .../apache/axis2/transport/base/AbstractTransportSender.java |  1 -
 .../main/java/org/apache/axis2/transport/jms/JMSSender.java  | 12 ++----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git 
a/1.0.0/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java
 
b/1.0.0/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java
index 080e105..4d3b4d0 100644
--- 
a/1.0.0/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java
+++ 
b/1.0.0/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java
@@ -134,7 +134,6 @@ public abstract class AbstractTransportSender extends 
AbstractHandler implements
         MessageContext msgCtx, Map trpHeaders,
         String soapAction, String contentType) {
 
-
         // set the soapaction if one is available via a transport header
         if (soapAction != null) {
             msgCtx.setSoapAction(soapAction);
diff --git 
a/1.0.0/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java 
b/1.0.0/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
index 3ead39f..3bb716e 100644
--- 
a/1.0.0/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
+++ 
b/1.0.0/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
@@ -449,22 +449,14 @@ public class JMSSender extends AbstractTransportSender 
implements ManagementSupp
         // load any transport headers from received message
         JMSUtils.loadTransportHeaders(message, responseMsgCtx);
 
-        // workaround for Axis2 TransportUtils.createSOAPMessage() issue, 
where a response
-        // of content type "text/xml" is thought to be REST if 
!MC.isServerSide(). This
-        // question is still under debate and due to the timelines, I am 
commiting this
-        // workaround as Axis2 1.2 is about to be released and Synapse 1.0
-        responseMsgCtx.setServerSide(false);
-
-        String contentType =
-                contentTypeProperty == null ? null
-                        : JMSUtils.getProperty(message, contentTypeProperty);
+        String contentType = contentTypeProperty == null ? null
+                : JMSUtils.getProperty(message, contentTypeProperty);
 
         try {
             JMSUtils.setSOAPEnvelope(message, responseMsgCtx, contentType);
         } catch (JMSException ex) {
             throw AxisFault.makeFault(ex);
         }
-//        responseMsgCtx.setServerSide(true);
 
         handleIncomingMessage(
             responseMsgCtx,