Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 96397 invoked from network); 2 Aug 2006 17:48:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 Aug 2006 17:48:16 -0000 Received: (qmail 24338 invoked by uid 500); 2 Aug 2006 17:48:15 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 24231 invoked by uid 500); 2 Aug 2006 17:48:14 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 24214 invoked by uid 500); 2 Aug 2006 17:48:14 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 24207 invoked by uid 99); 2 Aug 2006 17:48:14 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Aug 2006 10:48:14 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Aug 2006 10:48:13 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id D87341A981C; Wed, 2 Aug 2006 10:47:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r428068 - /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java Date: Wed, 02 Aug 2006 17:47:53 -0000 To: axis2-cvs@ws.apache.org From: chinthaka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060802174753.D87341A981C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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