cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1042806 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
Date Mon, 06 Dec 2010 21:48:22 GMT
Author: sergeyb
Date: Mon Dec  6 21:48:22 2010
New Revision: 1042806

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

........
  r1042805 | sergeyb | 2010-12-06 21:45:39 +0000 (Mon, 06 Dec 2010) | 1 line
  
  Fixing the system test failure
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec  6 21:48:22 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805

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

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java?rev=1042806&r1=1042805&r2=1042806&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
Mon Dec  6 21:48:22 2010
@@ -425,7 +425,7 @@ public class AbstractClient implements C
                 Object length = r.getMetadata().getFirst(HttpHeaders.CONTENT_LENGTH);
                 if (length == null || Integer.parseInt(length.toString()) == 0
                     || status >= 400) {
-                    return cls == Response.class ? r : inputStream;
+                    return cls == Response.class ? r : status >= 400 ? inputStream : null;
                 }
             }
         } catch (IOException ex) {



Mime
View raw message