cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1506617 - in /cxf/branches/2.6.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
Date Wed, 24 Jul 2013 16:30:05 GMT
Author: sergeyb
Date: Wed Jul 24 16:30:05 2013
New Revision: 1506617

URL: http://svn.apache.org/r1506617
Log:
Merged revisions 1506603 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

................
  r1506603 | sergeyb | 2013-07-24 16:53:56 +0100 (Wed, 24 Jul 2013) | 9 lines
  
  Merged revisions 1506577 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1506577 | sergeyb | 2013-07-24 15:34:43 +0100 (Wed, 24 Jul 2013) | 1 line
    
    [CXF-5144] Closing InputStream after read when possible
  ........
................

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

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/branches/2.7.x-fixes:r1506603
  Merged /cxf/trunk:r1506577

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

Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java?rev=1506617&r1=1506616&r2=1506617&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
Wed Jul 24 16:30:05 2013
@@ -447,6 +447,14 @@ public abstract class AbstractClient imp
                 return mbr.readFrom(cls, type, anns, contentType, m, inputStream);
             } catch (Exception ex) {
                 reportMessageHandlerProblem("MSG_READER_PROBLEM", cls, contentType, ex, r);
+            } finally {
+                if (cls != InputStream.class && inputStream != null) {
+                    try {
+                        inputStream.close();
+                    } catch (IOException ex) { 
+                        // ignore
+                    }
+                }
             }
         } else if (cls == Response.class) {
             return cls.cast(r);



Mime
View raw message