cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r719017 - in /cxf/trunk: common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java parent/pom.xml
Date Wed, 19 Nov 2008 18:10:49 GMT
Author: dkulp
Date: Wed Nov 19 10:10:49 2008
New Revision: 719017

URL: http://svn.apache.org/viewvc?rev=719017&view=rev
Log:
Update to JAXB 2.1.9 (fixes a memory leak)
Add a try/catch to allow use of some other Stax implementations (like BEA's)

Modified:
    cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
    cxf/trunk/parent/pom.xml

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=719017&r1=719016&r2=719017&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java Wed Nov
19 10:10:49 2008
@@ -76,8 +76,16 @@
     private static final String XML_NS = "http://www.w3.org/2000/xmlns/";
     
     static {
-        XML_INPUT_FACTORY.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, false);
-        XML_NS_AWARE_INPUT_FACTORY.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true);
+        try {
+            XML_INPUT_FACTORY.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, false);
+        } catch (Exception e) {
+            //ignore
+        }
+        try {
+            XML_NS_AWARE_INPUT_FACTORY.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true);
+        } catch (Exception ex) {
+            //ignore
+        }
     }
     
     private StaxUtils() {

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=719017&r1=719016&r2=719017&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Wed Nov 19 10:10:49 2008
@@ -43,8 +43,8 @@
         <saaj.impl.artifactId>saaj-impl</saaj.impl.artifactId>
 
         <jaxb.version>2.1</jaxb.version>
-        <jaxb.impl.version>2.1.7</jaxb.impl.version>
-        <jaxb.xjc.version>2.1.7</jaxb.xjc.version>
+        <jaxb.impl.version>2.1.9</jaxb.impl.version>
+        <jaxb.xjc.version>2.1.9</jaxb.xjc.version>
         <jetty.version>6.1.11</jetty.version>
         <saaj.version>1.3</saaj.version>
         <saaj.impl.version>1.3.2</saaj.impl.version>



Mime
View raw message