svn commit: r1419523 - in /cxf/branches/2.6.x-fixes: ./ api/src/main/java/org/apache/cxf/interceptor/transform/TransformInInterceptor.java rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java

[ay]

Author: ay
Date: Mon Dec 10 15:31:04 2012
New Revision: 1419523

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

........
  r1419471 | ay | 2012-12-10 15:06:19 +0100 (Mon, 10 Dec 2012) | 1 line
  
  [CXF-4690] stax's inTransform feature does not work with a provider's Source 
based service
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/interceptor/transform/TransformInInterceptor.java
    
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/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/interceptor/transform/TransformInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/interceptor/transform/TransformInInterceptor.java?rev=1419523&r1=1419522&r2=1419523&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/interceptor/transform/TransformInInterceptor.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/interceptor/transform/TransformInInterceptor.java
 Mon Dec 10 15:31:04 2012
@@ -79,7 +79,6 @@ public class TransformInInterceptor exte
         XMLStreamReader transformReader = 
createTransformReaderIfNeeded(reader, is);
         if (transformReader != null) {
             message.setContent(XMLStreamReader.class, transformReader);
-            message.removeContent(InputStream.class);
         }
          
     }

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=1419523&r1=1419522&r2=1419523&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
 Mon Dec 10 15:31:04 2012
@@ -181,31 +181,24 @@ public class XMLStreamDataReader impleme
                 public boolean hasNext() throws XMLStreamException {
                     boolean b = super.hasNext();
                     if (!b && !closed) {
-                        closed = true;
-                        try {
-                            super.close();
-                        } catch (XMLStreamException e) {
-                            //ignore
-                        }
-                        try {
-                            ins.close();
-                        } catch (IOException e) {
-                            //ignore
-                        }
+                        close();
                     }
                     return b;
                 }
 
                 public void close() throws XMLStreamException {
+                    closed = true;
                     try {
                         super.close();
                     }  catch (XMLStreamException e) {
                         //ignore
                     }
-                    try {
-                        ins.close();
-                    }  catch (IOException e) {
-                        //ignore
+                    if (ins != null) {
+                        try {
+                            ins.close();
+                        }  catch (IOException e) {
+                            //ignore
+                        }
                     }
                 }
             };