svn commit: r1126415 - in /cxf/branches/2.3.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/attachment/DelegatingInputStream.java

[ffang]

Author: ffang
Date: Mon May 23 10:03:50 2011
New Revision: 1126415

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

........
  r1126410 | ffang | 2011-05-23 17:50:16 +0800 (一, 23  5 2011) | 1 line
  
  [CXF-3504]read through DelegatingInputStream when close it, ensure no cache 
file left on disk and correctly close the connection.
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/DelegatingInputStream.java

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

Modified: 
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/DelegatingInputStream.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/DelegatingInputStream.java?rev=1126415&r1=1126414&r2=1126415&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/DelegatingInputStream.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/DelegatingInputStream.java
 Mon May 23 10:03:50 2011
@@ -42,6 +42,10 @@ public class DelegatingInputStream exten
 
     @Override
     public void close() throws IOException {
+        int x = is.read();
+        while (x != -1) {
+            x = is.read();
+        }
         is.close();
         if (!isClosed && deserializer != null) {
             deserializer.markClosed(this);