Author: chinthaka
Date: Wed Aug  2 10:47:52 2006
New Revision: 428068

URL: http://svn.apache.org/viewvc?rev=428068&view=rev
Log:
Static REST flag should not be tested in isDoingREST call.

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?rev=428068&r1=428067&r2=428068&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java Wed Aug  2 10:47:52 2006
@@ -23,11 +23,7 @@
 import org.apache.axiom.om.impl.builder.StAXBuilder;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPProcessingException;
+import org.apache.axiom.soap.*;
 import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
 import org.apache.axiom.soap.impl.llom.soap11.SOAP11Factory;
 import org.apache.axiom.soap.impl.llom.soap12.SOAP12Factory;
@@ -40,8 +36,8 @@
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.transport.TransportUtils;
-import org.apache.axis2.util.Utils;
 import org.apache.axis2.util.JavaUtils;
+import org.apache.axis2.util.Utils;
 
 import javax.xml.parsers.FactoryConfigurationError;
 import javax.xml.stream.XMLStreamException;
@@ -104,7 +100,7 @@
         boolean enableMTOM = false;
 
         if (msgContext.getParameter(Constants.Configuration.ENABLE_MTOM) != null) {
-            enableMTOM = JavaUtils.isTrueExplicitly( 
+            enableMTOM = JavaUtils.isTrueExplicitly(
                     msgContext.getParameter(Constants.Configuration.ENABLE_MTOM).getValue());
         }
 
@@ -313,11 +309,7 @@
             return true;
         }
 
-        Parameter parameter = msgContext.getParameter(Constants.Configuration.ENABLE_REST);
-
-        if (parameter != null) {
-            enableREST = JavaUtils.isTrueExplicitly(parameter.getValue());
-        } else if (msgContext.getProperty(Constants.Configuration.ENABLE_REST) != null) {
+        if (msgContext.getProperty(Constants.Configuration.ENABLE_REST) != null) {
             enableREST = JavaUtils.isTrueExplicitly(
                     msgContext.getProperty(Constants.Configuration.ENABLE_REST));
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org