You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ro...@apache.org on 2008/01/11 00:02:42 UTC
svn commit: r610975 -
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
Author: rott
Date: Thu Jan 10 15:02:41 2008
New Revision: 610975
URL: http://svn.apache.org/viewvc?rev=610975&view=rev
Log:
AXIS2-3228 be less aggressive about changing to REST message processing
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java?rev=610975&r1=610974&r2=610975&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java Thu Jan 10 15:02:41 2008
@@ -141,13 +141,16 @@
}
// Some services send REST responces as text/xml. We should convert it to
// application/xml if its a REST response, if not it will try to use the SOAPMessageBuilder.
- if (HTTPConstants.MEDIA_TYPE_TEXT_XML.equals(type)) {
+ // isDoingREST should already be properly set by HTTPTransportUtils.initializeMessageContext
+ if (msgContext.isDoingREST() && HTTPConstants.MEDIA_TYPE_TEXT_XML.equals(type)) {
+// if (HTTPConstants.MEDIA_TYPE_TEXT_XML.equals(type)) {
if (msgContext.isServerSide()) {
if (msgContext.getSoapAction() == null) {
type = HTTPConstants.MEDIA_TYPE_APPLICATION_XML;
}
- } else if (msgContext.isDoingREST() &&
- !msgContext.isPropertyTrue(Constants.Configuration.SOAP_RESPONSE_MEP)) {
+// } else if (msgContext.isDoingREST() &&
+// !msgContext.isPropertyTrue(Constants.Configuration.SOAP_RESPONSE_MEP)) {
+ } else if (!msgContext.isPropertyTrue(Constants.Configuration.SOAP_RESPONSE_MEP)) {
type = HTTPConstants.MEDIA_TYPE_APPLICATION_XML;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org