svn commit: r1355400 - in /cxf/branches/2.6.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java rt/core/src/test/java/org/apache/cxf/databinding/

[ay]

Author: ay
Date: Fri Jun 29 14:15:53 2012
New Revision: 1355400

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

........
  r1355396 | ay | 2012-06-29 16:09:21 +0200 (Fri, 29 Jun 2012) | 1 line
  
  [CXF-4401] XMLStreamDataReader not closing the original input stream
........

Added:
    cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/databinding/
      - copied from r1355396, 
cxf/trunk/rt/core/src/test/java/org/apache/cxf/databinding/
Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    
cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java

Propchange: cxf/branches/2.6.x-fixes/
            ('svn:mergeinfo' removed)

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

Modified: 
cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java?rev=1355400&r1=1355399&r2=1355400&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
 Fri Jun 29 14:15:53 2012
@@ -183,6 +183,19 @@ public class XMLStreamDataReader impleme
                     }
                     return b;
                 }
+
+                public void close() throws XMLStreamException {
+                    try {
+                        super.close();
+                    }  catch (XMLStreamException e) {
+                        //ignore
+                    }
+                    try {
+                        ins.close();
+                    }  catch (IOException e) {
+                        //ignore
+                    }
+                }
             };
         }
         return input;