cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1372099 - in /cxf/branches/2.6.x-fixes: parent/pom.xml rt/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
Date Sun, 12 Aug 2012 14:17:41 GMT
Author: dkulp
Date: Sun Aug 12 14:17:40 2012
New Revision: 1372099

URL: http://svn.apache.org/viewvc?rev=1372099&view=rev
Log:
Merged revisions 1372094 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1372094 | dkulp | 2012-08-12 10:09:47 -0400 (Sun, 12 Aug 2012) | 2 lines

  Upgrade to latest woodstox that fixes a performance regression.

........

Modified:
    cxf/branches/2.6.x-fixes/parent/pom.xml
    cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java

Modified: cxf/branches/2.6.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/parent/pom.xml?rev=1372099&r1=1372098&r2=1372099&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/parent/pom.xml Sun Aug 12 14:17:40 2012
@@ -119,7 +119,7 @@
         <cxf.spring.mock>spring-test</cxf.spring.mock>
         <cxf.stax.impl.groupId>org.codehaus.woodstox</cxf.stax.impl.groupId>
         <cxf.stax.impl.artifactId>woodstox-core-asl</cxf.stax.impl.artifactId>
-        <cxf.woodstox.core.version>4.1.2</cxf.woodstox.core.version>
+        <cxf.woodstox.core.version>4.1.4</cxf.woodstox.core.version>
         <cxf.stax.impl.version>${cxf.woodstox.core.version}</cxf.stax.impl.version>
         <cxf.woodstox.stax2-api.version>3.1.1</cxf.woodstox.stax2-api.version>
         <cxf.wsdl4j.version>1.6.2</cxf.wsdl4j.version>

Modified: cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java?rev=1372099&r1=1372098&r2=1372099&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
Sun Aug 12 14:17:40 2012
@@ -44,22 +44,19 @@ public class XMLStreamDataReaderTest ext
         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);
+                                 StaxUtils.createXMLStreamReader(in1), XMLStreamReader.class);
 
         assertTrue(obj instanceof XMLStreamReader);
         
         assertFalse(in1.isClosed());
-        assertFalse(in2.isClosed());
         ((XMLStreamReader)obj).close();
         
-        assertTrue(in2.isClosed());
         assertTrue(in1.isClosed());
     }
     



Mime
View raw message