cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1171806 - in /cxf/branches/2.4.x-fixes: ./ api/src/main/java/org/apache/cxf/message/Message.java rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Date Fri, 16 Sep 2011 21:34:21 GMT
Author: dkulp
Date: Fri Sep 16 21:34:21 2011
New Revision: 1171806

URL: http://svn.apache.org/viewvc?rev=1171806&view=rev
Log:
Merged revisions 1171799 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1171799 | dkulp | 2011-09-16 17:30:06 -0400 (Fri, 16 Sep 2011) | 2 lines
  
  Remove property added to workaround Camel issue that is now fixed in
  Camel
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java
    cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java?rev=1171806&r1=1171805&r2=1171806&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java (original)
+++ cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java Fri Sep
16 21:34:21 2011
@@ -67,7 +67,6 @@ public interface Message extends StringM
      */
     String DECOUPLED_CHANNEL_MESSAGE = "decoupled.channel.message";
     String PARTIAL_RESPONSE_MESSAGE = "org.apache.cxf.partial.response";
-    String HANDLING_PARTIAL_RESPONSE_MESSAGE = "org.apache.cxf.partial.response.handling";
     String ONE_WAY_REQUEST = "OnewayRequest";
     
 

Modified: cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1171806&r1=1171805&r2=1171806&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Fri Sep 16 21:34:21 2011
@@ -1531,12 +1531,6 @@ public class HTTPConduit 
         protected void handleResponseInternal() throws IOException {
             Exchange exchange = outMessage.getExchange();
             int responseCode = connection.getResponseCode();
-            // handling the particalResponse by default
-            boolean handlingParticalResponse = true;
-            // this option will be set to false when we leverage the CXF transport to send
stream message
-            if (Boolean.FALSE.equals(outMessage.get(Message.HANDLING_PARTIAL_RESPONSE_MESSAGE)))
{
-                handlingParticalResponse = false;
-            }
             
             if (outMessage != null && exchange != null) {
                 exchange.put(Message.RESPONSE_CODE, responseCode);
@@ -1556,7 +1550,7 @@ public class HTTPConduit 
             InputStream in = null;
             // oneway or decoupled twoway calls may expect HTTP 202 with no content
             if (isOneway(exchange) 
-                || (HttpURLConnection.HTTP_ACCEPTED == responseCode && handlingParticalResponse))
{
+                || HttpURLConnection.HTTP_ACCEPTED == responseCode) {
                 in = ChunkedUtil.getPartialResponse(connection, responseCode);
                 if (in == null) {
                     // oneway operation or decoupled MEP without 



Mime
View raw message