cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1186405 - in /cxf/branches/2.3.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
Date Wed, 19 Oct 2011 19:01:07 GMT
Author: dkulp
Date: Wed Oct 19 19:01:06 2011
New Revision: 1186405

URL: http://svn.apache.org/viewvc?rev=1186405&view=rev
Log:
Merged revisions 1186391 via svnmerge from 
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1186391 | dkulp | 2011-10-19 14:44:29 -0400 (Wed, 19 Oct 2011) | 10 lines
  
  Merged revisions 1185158 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1185158 | dkulp | 2011-10-17 09:23:32 -0400 (Mon, 17 Oct 2011) | 2 lines
    
    Make sure the wrapped XMLStreamReader can cleanup any resources it may
    be caching
  ........
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.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/databinding/source/XMLStreamDataReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java?rev=1186405&r1=1186404&r2=1186405&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
Wed Oct 19 19:01:06 2011
@@ -172,6 +172,11 @@ public class XMLStreamDataReader impleme
                     if (!b && !closed) {
                         closed = true;
                         try {
+                            super.close();
+                        } catch (XMLStreamException e) {
+                            //ignore
+                        }
+                        try {
                             ins.close();
                         } catch (IOException e) {
                             //ignore



Mime
View raw message