cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1355396 - in /cxf/trunk/rt/core/src: main/java/org/apache/cxf/databinding/source/ test/java/org/apache/cxf/databinding/ test/java/org/apache/cxf/databinding/source/
Date Fri, 29 Jun 2012 14:09:22 GMT
Author: ay
Date: Fri Jun 29 14:09:21 2012
New Revision: 1355396

URL: http://svn.apache.org/viewvc?rev=1355396&view=rev
Log:
[CXF-4401] XMLStreamDataReader not closing the original input stream

Added:
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/databinding/
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/databinding/source/
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
  (with props)
Modified:
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java?rev=1355396&r1=1355395&r2=1355396&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
(original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
Fri Jun 29 14:09:21 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;

Added: cxf/trunk/rt/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java?rev=1355396&view=auto
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
(added)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
Fri Jun 29 14:09:21 2012
@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.databinding.source;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.staxutils.StaxUtils;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * 
+ */
+public class XMLStreamDataReaderTest extends Assert {
+    private static final byte[] DUMMY_DATA = "<ns:dummy xmlns:ns='http://www.apache.org/cxf'/>".getBytes();
+    
+    @Test
+    public void testCloseOriginalInputStream() throws Exception {
+        XMLStreamDataReader reader = new XMLStreamDataReader();
+        Message msg = new MessageImpl();
+        TestInputStream in1 = new TestInputStream(DUMMY_DATA);
+        TestInputStream in2 = new TestInputStream(DUMMY_DATA);
+        
+        msg.setContent(InputStream.class, in1);
+        
+        reader.setProperty(Message.class.getName(), msg);
+        
+        Object obj = reader.read(new QName("http://www.apache.org/cxf", "dummy"), 
+                                 StaxUtils.createXMLStreamReader(in2), XMLStreamReader.class);
+
+        assertTrue(obj instanceof XMLStreamReader);
+        
+        assertFalse(in1.isClosed());
+        assertFalse(in2.isClosed());
+        ((XMLStreamReader)obj).close();
+        
+        assertTrue(in2.isClosed());
+        assertTrue(in1.isClosed());
+    }
+    
+    private static class TestInputStream extends ByteArrayInputStream {
+        private boolean closed;
+        
+        public TestInputStream(byte[] buf) {
+            super(buf);
+        }
+
+        @Override
+        public void close() throws IOException {
+            closed = true;
+            super.close();
+        }
+        
+        public boolean isClosed() {
+            return closed;
+        }
+    }
+}

Propchange: cxf/trunk/rt/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
------------------------------------------------------------------------------
    svn:executable = *



Mime
View raw message