cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r783140 - in /cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/staxutils/ rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/ rt/cor...
Date Tue, 09 Jun 2009 21:09:34 GMT
Author: dkulp
Date: Tue Jun  9 21:09:30 2009
New Revision: 783140

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

................
  r777200 | dkulp | 2009-05-21 13:40:19 -0400 (Thu, 21 May 2009) | 10 lines
  
  Merged revisions 777189 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r777189 | dkulp | 2009-05-21 13:28:57 -0400 (Thu, 21 May 2009) | 2 lines
    
    Add sync blocks when using the XMLInput/OutputFactories since the Sun
    stax parsers aren't thread safe.
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
    cxf/branches/2.0.x-fixes/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterInInterceptor.java
    cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
    cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
    cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
    cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/versioning/MediatorInInterceptor.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  9 21:09:30 2009
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596,745598,745600,745604-745605,745607,745639,745954,746013,746021-746022,747459,747461-747464,747466,747471,747477,747817,748248,748324,748605,748607-748608,749372,750958,750971,750973,750977,750980,750983
 -750984,750986,750988,751006,751235,751238,751943,751979,752118,752142,752162,752244,752248,752563,752615,752852-752854,752856,752916-752917,752993,757964,757966,757971,757973,758347,758404,759994-759996,760076,760154,760469,761762,761790,762395,764047-764048,764052,764058,764062,764147,764587,764892,766045,766119,766964,767152,767155,767160,767187,772161,772661-772662,772668,772686,772720,773080,773082,773086-773087,773147,773946-773950,774790,774800,774803,774818,774823,774827,775950,775952,776033,776235,777198,780202,780918,780960
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
 1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743446,743459,743469,743965,743967,744175,744195,744756,745214,745243,745560,745578,745586,745638,745950,746012,746019-746020,746306,746357,746373-746374,747217,747386,747406,747454,747766,748223,748305,748313,748603-748604,748768,749511,749584,749767,749771,749890,750059-750060,750591,750689,750935,751067-751110,751233,751740,751787,751828,751840,752122,752132,752136,752558,752613,752680,752728,752753,752849,752880-752881,752992,754585,755365,757859,757899,758308,759963-759964,759966,760073,760150,760468,761759,761789,762393,763272,763495,763931,764034,
 764581,764887,766013,766101,766860,766962-766963,767159,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773691,773693,774558,774851,774979,776024,776218,776459,780184,780902
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596,745598,745600,745604-745605,745607,745639,745954,746013,746021-746022,747459,747461-747464,747466,747471,747477,747817,748248,748324,748605,748607-748608,749372,750958,750971,750973,750977,750980,750983
 -750984,750986,750988,751006,751235,751238,751943,751979,752118,752142,752162,752244,752248,752563,752615,752852-752854,752856,752916-752917,752993,757964,757966,757971,757973,758347,758404,759994-759996,760076,760154,760469,761762,761790,762395,764047-764048,764052,764058,764062,764147,764587,764892,766045,766119,766964,767152,767155,767160,767187,772161,772661-772662,772668,772686,772720,773080,773082,773086-773087,773147,773946-773950,774790,774800,774803,774818,774823,774827,775950,775952,776033,776235,777198,777200,780202,780918,780960
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
 1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743446,743459,743469,743965,743967,744175,744195,744756,745214,745243,745560,745578,745586,745638,745950,746012,746019-746020,746306,746357,746373-746374,747217,747386,747406,747454,747766,748223,748305,748313,748603-748604,748768,749511,749584,749767,749771,749890,750059-750060,750591,750689,750935,751067-751110,751233,751740,751787,751828,751840,752122,752132,752136,752558,752613,752680,752728,752753,752849,752880-752881,752992,754585,755365,757859,757899,758308,759963-759964,759966,760073,760150,760468,761759,761789,762393,763272,763495,763931,764034,
 764581,764887,766013,766101,766860,766962-766963,767159,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773691,773693,774558,774851,774979,776024,776218,776459,777189,780184,780902
 /incubator/cxf/trunk:434594-651668

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=783140&r1=783139&r2=783140&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
(original)
+++ cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
Tue Jun  9 21:09:30 2009
@@ -125,7 +125,10 @@
 
     public static XMLStreamWriter createXMLStreamWriter(Writer out) {
         try {
-            return getXMLOutputFactory().createXMLStreamWriter(out);
+            XMLOutputFactory factory = getXMLOutputFactory();
+            synchronized (factory) {
+                return factory.createXMLStreamWriter(out);
+            }
         } catch (XMLStreamException e) {
             throw new RuntimeException("Cant' create XMLStreamWriter", e);
         }
@@ -141,7 +144,10 @@
         }
 
         try {
-            return getXMLOutputFactory().createXMLStreamWriter(out, encoding);
+            XMLOutputFactory factory = getXMLOutputFactory();
+            synchronized (factory) {
+                return factory.createXMLStreamWriter(out, encoding);
+            }
         } catch (XMLStreamException e) {
             throw new RuntimeException("Cant' create XMLStreamWriter", e);
         }
@@ -149,7 +155,10 @@
     
     public static XMLStreamWriter createXMLStreamWriter(Result r) {
         try {
-            return getXMLOutputFactory().createXMLStreamWriter(r);
+            XMLOutputFactory factory = getXMLOutputFactory();
+            synchronized (factory) {
+                return factory.createXMLStreamWriter(r);
+            }
         } catch (XMLStreamException e) {
             throw new RuntimeException("Cant' create XMLStreamWriter", e);
         }
@@ -157,7 +166,10 @@
 
     public static XMLStreamReader createFilteredReader(XMLStreamReader reader, StreamFilter
filter) {
         try {
-            return getXMLInputFactory().createFilteredReader(reader, filter);
+            XMLInputFactory factory = getXMLInputFactory();
+            synchronized (factory) {
+                return factory.createFilteredReader(reader, filter);
+            }
         } catch (XMLStreamException e) {
             throw new RuntimeException("Cant' create XMLStreamReader", e);
         }
@@ -785,7 +797,10 @@
         }
 
         try {
-            return getXMLInputFactory().createXMLStreamReader(in, encoding);
+            XMLInputFactory factory = getXMLInputFactory();
+            synchronized (factory) {
+                return factory.createXMLStreamReader(in, encoding);
+            }
         } catch (XMLStreamException e) {
             throw new RuntimeException("Couldn't parse stream.", e);
         }
@@ -797,11 +812,26 @@
      */
     public static XMLStreamReader createXMLStreamReader(InputStream in) {
         try {
-            return getXMLInputFactory().createXMLStreamReader(in);
+            XMLInputFactory factory = getXMLInputFactory();
+            synchronized (factory) {
+                return factory.createXMLStreamReader(in);
+            }
+        } catch (XMLStreamException e) {
+            throw new RuntimeException("Couldn't parse stream.", e);
+        }
+    }
+
+    public static XMLStreamReader createXMLStreamReader(String systemId, InputStream in)
{
+        try {
+            XMLInputFactory factory = getXMLInputFactory();
+            synchronized (factory) {
+                return factory.createXMLStreamReader(systemId, in);
+            }
         } catch (XMLStreamException e) {
             throw new RuntimeException("Couldn't parse stream.", e);
         }
     }
+
     
     public static XMLStreamReader createXMLStreamReader(Element el) {
         return new W3CDOMStreamReader(el);
@@ -825,8 +855,10 @@
                     return new W3CDOMStreamReader(el);
                 }
             }
-            
-            return getXMLInputFactory().createXMLStreamReader(source);
+            XMLInputFactory factory = getXMLInputFactory();
+            synchronized (factory) {
+                return factory.createXMLStreamReader(source);
+            }
         } catch (XMLStreamException e) {
             throw new RuntimeException("Couldn't parse stream.", e);
         }
@@ -839,7 +871,10 @@
     public static XMLStreamReader createXMLStreamReader(Reader reader) {
 
         try {
-            return getXMLInputFactory().createXMLStreamReader(reader);
+            XMLInputFactory factory = getXMLInputFactory();
+            synchronized (factory) {
+                return factory.createXMLStreamReader(reader);
+            }
         } catch (XMLStreamException e) {
             throw new RuntimeException("Couldn't parse stream.", e);
         }

Modified: cxf/branches/2.0.x-fixes/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterInInterceptor.java?rev=783140&r1=783139&r2=783140&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterInInterceptor.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterInInterceptor.java
Tue Jun  9 21:09:30 2009
@@ -113,8 +113,10 @@
         if ("POST".equals(method) || "PUT".equals(method)) {
             XMLInputFactory inputFactory = StaxInInterceptor.getXMLInputFactory(message);
             try {
-                XMLStreamReader reader = 
-                    inputFactory.createXMLStreamReader(message.getContent(InputStream.class));
+                XMLStreamReader reader;
+                synchronized (inputFactory) {
+                    reader = inputFactory.createXMLStreamReader(message.getContent(InputStream.class));
+                }
                 doc = StaxUtils.read(reader);
             } catch (XMLStreamException e) {
                 throw new Fault(e);

Modified: cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java?rev=783140&r1=783139&r2=783140&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
Tue Jun  9 21:09:30 2009
@@ -20,7 +20,6 @@
 package org.apache.cxf.binding.soap.saaj;
 
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ResourceBundle;
@@ -95,8 +94,12 @@
             //as the SOAPMessage already has everything in place, we do not need XMLStreamWriter
to write
             //anything for us, so we just set XMLStreamWriter's output to a dummy output
stream.         
             try {
-                XMLStreamWriter dummyWriter = StaxUtils.getXMLOutputFactory()
-                    .createXMLStreamWriter(new ByteArrayOutputStream());
+                XMLStreamWriter dummyWriter = StaxUtils.createXMLStreamWriter(new OutputStream()
{
+                        public void write(int b) throws IOException {
+                        }
+                        public void write(byte b[], int off, int len) throws IOException
{
+                        }                        
+                    });
                 message.setContent(XMLStreamWriter.class, dummyWriter);
             } catch (XMLStreamException e) {
                 // do nothing

Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java?rev=783140&r1=783139&r2=783140&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
Tue Jun  9 21:09:30 2009
@@ -78,7 +78,10 @@
 
         XMLStreamReader reader;
         try {
-            reader = getXMLInputFactory(message).createXMLStreamReader(is, encoding);
+            XMLInputFactory factory = getXMLInputFactory(message);
+            synchronized (factory) {
+                reader = factory.createXMLStreamReader(is, encoding);
+            }
         } catch (XMLStreamException e) {
             throw new Fault(new org.apache.cxf.common.i18n.Message("STREAM_CREATE_EXC",
                                                                    LOG,

Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java?rev=783140&r1=783139&r2=783140&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
Tue Jun  9 21:09:30 2009
@@ -63,7 +63,10 @@
         String encoding = getEncoding(message);
         
         try {
-            writer = getXMLOutputFactory(message).createXMLStreamWriter(os, encoding);
+            XMLOutputFactory factory = getXMLOutputFactory(message);
+            synchronized (factory) {
+                writer = factory.createXMLStreamWriter(os, encoding);
+            }
         } catch (XMLStreamException e) {
             throw new Fault(new org.apache.cxf.common.i18n.Message("STREAM_CREATE_EXC", BUNDLE),
e);
         }

Modified: cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java?rev=783140&r1=783139&r2=783140&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
Tue Jun  9 21:09:30 2009
@@ -60,7 +60,6 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
@@ -124,7 +123,6 @@
     /** The factory for creating new JDOM objects */
     private JDOMFactory factory;
 
-    private XMLInputFactory xifactory;
 
     private Map additionalNamespaces;
     // This is set to 'true' when we are reading the middle of a stream,
@@ -135,17 +133,12 @@
      * Default constructor.
      */
     public StaxBuilder() {
-        xifactory = StaxUtils.getXMLInputFactory();
     }
 
     public StaxBuilder(Map namespaces) {
-        xifactory = StaxUtils.getXMLInputFactory();
         this.additionalNamespaces = namespaces;
     }
 
-    public StaxBuilder(XMLInputFactory xifactory) {
-        this.xifactory = xifactory;
-    }
 
     public Map getAdditionalNamespaces() {
         return additionalNamespaces;
@@ -193,12 +186,12 @@
 
     public Document build(InputStream is) throws XMLStreamException {
         isReadingMidStream = false;
-        return buildInternal(xifactory.createXMLStreamReader(is));
+        return buildInternal(StaxUtils.createXMLStreamReader(is));
     }
 
     public Document build(Reader reader) throws XMLStreamException {
         isReadingMidStream = false;
-        return buildInternal(xifactory.createXMLStreamReader(reader));
+        return buildInternal(StaxUtils.createXMLStreamReader(reader));
     }
     
     private Document buildInternal(XMLStreamReader r) throws XMLStreamException {

Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/versioning/MediatorInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/versioning/MediatorInInterceptor.java?rev=783140&r1=783139&r2=783140&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/versioning/MediatorInInterceptor.java
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/versioning/MediatorInInterceptor.java
Tue Jun  9 21:09:30 2009
@@ -25,6 +25,7 @@
 
 
 
+import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 
 import org.apache.cxf.endpoint.Endpoint;
@@ -62,8 +63,10 @@
             String encoding = (String)message.get(Message.ENCODING);
 
             XMLStreamReader xsr;
-            xsr = StaxInInterceptor.getXMLInputFactory(message).
-                createXMLStreamReader(bos.getInputStream(), encoding);
+            XMLInputFactory factory = StaxInInterceptor.getXMLInputFactory(message);
+            synchronized (factory) {
+                xsr = factory.createXMLStreamReader(bos.getInputStream(), encoding);
+            }
             
             // move to the soap body            
             while (true) {                



Mime
View raw message