Author: dkulp Date: Thu Jul 16 17:13:22 2009 New Revision: 794756 URL: http://svn.apache.org/viewvc?rev=794756&view=rev Log: Merged revisions 794411,794694 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r794411 | dkulp | 2009-07-15 16:48:49 -0400 (Wed, 15 Jul 2009) | 18 lines Merged revisions 794404 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes ................ r794404 | dkulp | 2009-07-15 16:26:33 -0400 (Wed, 15 Jul 2009) | 11 lines Merged revisions 794396 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r794396 | dkulp | 2009-07-15 16:17:11 -0400 (Wed, 15 Jul 2009) | 3 lines [CXF-2342] Update to use pools of XMLInputFactory/XMLOutputFactory objects Modified patch from Kevin Conaway applied ........ ................ ................ r794694 | dkulp | 2009-07-16 10:37:21 -0400 (Thu, 16 Jul 2009) | 2 lines Fix compile failure ................ 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/common/common/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.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/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/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchInDatabindingInterceptor.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 Thu Jul 16 17:13:22 2009 @@ -1,4 +1,4 @@ -/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,777226,780202,780918,780960,781586,781843,783117,783415,784067,785305,785308,786029,786160,786600,786642,786663,787289,787296,787298,787373,789755,789757-789758,789760,789763,789918,789924-789925,790663,790671,790673,792305-792307,793011,793014 -/cxf/branches/2.2.x-fixes:783099,783407,784064,785293,785299,786158,786592,786640,787272,787282-787283,787367,789423,789707,789709-789710,789712,789905,789908,789910,790647,790654-790655,792276,792288,792291,792995,792998 -/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,777224,780184,780902,781497,781841,783097,783396,784059,784895,785281,786142,786583,786638,786647,787277-787278,787366,789371,789527-789529,789704,789896,789898-789899,790638,790640-790642,792261-792263,792975,792985 +/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,777226,780202,780918,780960,781586,781843,783117,783415,784067,785305,785308,786029,786160,786600,786642,786663,787289,787296,787298,787373,789755,789757-789758,789760,789763,789918,789924-789925,790663,790671,790673,792305-792307,793011,793014,794411-794694 +/cxf/branches/2.2.x-fixes:783099,783407,784064,785293,785299,786158,786592,786640,787272,787282-787283,787367,789423,789707,789709-789710,789712,789905,789908,789910,790647,790654-790655,792276,792288,792291,792995,792998,794404 +/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,777224,780184,780902,781497,781841,783097,783396,784059,784895,785281,786142,786583,786638,786647,787277-787278,787366,789371,789527-789529,789704,789896,789898-789899,790638,790640-790642,792261-792263,792975,792985,794396 /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=794756&r1=794755&r2=794756&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 Thu Jul 16 17:13:22 2009 @@ -23,9 +23,9 @@ import java.io.OutputStream; import java.io.Reader; import java.io.Writer; -//import java.util.HashMap; -//import java.util.Map; import java.util.Iterator; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedBlockingQueue; import java.util.logging.Logger; import javax.xml.namespace.NamespaceContext; @@ -69,23 +69,27 @@ private static final Logger LOG = LogUtils.getL7dLogger(StaxUtils.class); - private static final XMLInputFactory XML_NS_AWARE_INPUT_FACTORY = XMLInputFactory.newInstance(); - private static final XMLInputFactory XML_INPUT_FACTORY = XMLInputFactory.newInstance(); - private static final XMLOutputFactory XML_OUTPUT_FACTORY = XMLOutputFactory.newInstance(); + private static final BlockingQueue<XMLInputFactory> NS_AWARE_INPUT_FACTORY_POOL; + private static final BlockingQueue<XMLOutputFactory> OUTPUT_FACTORY_POOL; private static final String XML_NS = "http://www.w3.org/2000/xmlns/";; static { + int i = 20; + try { - XML_INPUT_FACTORY.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, false); - } catch (Exception e) { - //ignore + String s = System.getProperty("org.apache.cxf.staxutils.pool-size", + "-1"); + i = Integer.parseInt(s); + } catch (Throwable t) { + //ignore + i = 20; } - try { - XML_NS_AWARE_INPUT_FACTORY.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true); - } catch (Exception ex) { - //ignore + if (i <= 0) { + i = 20; } + NS_AWARE_INPUT_FACTORY_POOL = new LinkedBlockingQueue<XMLInputFactory>(i); + OUTPUT_FACTORY_POOL = new LinkedBlockingQueue<XMLOutputFactory>(i); } private StaxUtils() { @@ -95,17 +99,29 @@ * Return a cached, namespace-aware, factory. * @return */ - public static XMLInputFactory getXMLInputFactory() { - return getXMLInputFactory(true); + private static XMLInputFactory getXMLInputFactory() { + XMLInputFactory f = NS_AWARE_INPUT_FACTORY_POOL.poll(); + if (f == null) { + f = XMLInputFactory.newInstance(); + f.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true); + } + return f; } - /** - * Return a cached factory. - * @param nsAware - * @return - */ - public static XMLInputFactory getXMLInputFactory(boolean nsAware) { - return nsAware ? XML_NS_AWARE_INPUT_FACTORY : XML_INPUT_FACTORY; + private static void returnXMLInputFactory(XMLInputFactory factory) { + NS_AWARE_INPUT_FACTORY_POOL.offer(factory); + } + + private static XMLOutputFactory getXMLOutputFactory() { + XMLOutputFactory f = OUTPUT_FACTORY_POOL.poll(); + if (f == null) { + f = XMLOutputFactory.newInstance(); + } + return f; + } + + private static void returnXMLOutputFactory(XMLOutputFactory factory) { + OUTPUT_FACTORY_POOL.offer(factory); } /** @@ -119,18 +135,16 @@ return factory; } - public static XMLOutputFactory getXMLOutputFactory() { - return XML_OUTPUT_FACTORY; - } + public static XMLStreamWriter createXMLStreamWriter(Writer out) { + XMLOutputFactory factory = getXMLOutputFactory(); try { - XMLOutputFactory factory = getXMLOutputFactory(); - synchronized (factory) { - return factory.createXMLStreamWriter(out); - } + return factory.createXMLStreamWriter(out); } catch (XMLStreamException e) { throw new RuntimeException("Cant' create XMLStreamWriter", e); + } finally { + returnXMLOutputFactory(factory); } } @@ -142,36 +156,35 @@ if (encoding == null) { encoding = "UTF-8"; } - + XMLOutputFactory factory = getXMLOutputFactory(); try { - XMLOutputFactory factory = getXMLOutputFactory(); - synchronized (factory) { - return factory.createXMLStreamWriter(out, encoding); - } + return factory.createXMLStreamWriter(out, encoding); } catch (XMLStreamException e) { throw new RuntimeException("Cant' create XMLStreamWriter", e); + } finally { + returnXMLOutputFactory(factory); } } public static XMLStreamWriter createXMLStreamWriter(Result r) { + XMLOutputFactory factory = getXMLOutputFactory(); try { - XMLOutputFactory factory = getXMLOutputFactory(); - synchronized (factory) { - return factory.createXMLStreamWriter(r); - } + return factory.createXMLStreamWriter(r); } catch (XMLStreamException e) { throw new RuntimeException("Cant' create XMLStreamWriter", e); + } finally { + returnXMLOutputFactory(factory); } } public static XMLStreamReader createFilteredReader(XMLStreamReader reader, StreamFilter filter) { + XMLInputFactory factory = getXMLInputFactory(); try { - XMLInputFactory factory = getXMLInputFactory(); - synchronized (factory) { - return factory.createFilteredReader(reader, filter); - } + return factory.createFilteredReader(reader, filter); } catch (XMLStreamException e) { throw new RuntimeException("Cant' create XMLStreamReader", e); + } finally { + returnXMLInputFactory(factory); } } @@ -796,13 +809,13 @@ encoding = "UTF-8"; } + XMLInputFactory factory = getXMLInputFactory(); try { - XMLInputFactory factory = getXMLInputFactory(); - synchronized (factory) { - return factory.createXMLStreamReader(in, encoding); - } + return factory.createXMLStreamReader(in, encoding); } catch (XMLStreamException e) { throw new RuntimeException("Couldn't parse stream.", e); + } finally { + returnXMLInputFactory(factory); } } @@ -811,24 +824,24 @@ * @return */ public static XMLStreamReader createXMLStreamReader(InputStream in) { + XMLInputFactory factory = getXMLInputFactory(); try { - XMLInputFactory factory = getXMLInputFactory(); - synchronized (factory) { - return factory.createXMLStreamReader(in); - } + return factory.createXMLStreamReader(in); } catch (XMLStreamException e) { throw new RuntimeException("Couldn't parse stream.", e); + } finally { + returnXMLInputFactory(factory); } } public static XMLStreamReader createXMLStreamReader(String systemId, InputStream in) { + XMLInputFactory factory = getXMLInputFactory(); try { - XMLInputFactory factory = getXMLInputFactory(); - synchronized (factory) { - return factory.createXMLStreamReader(systemId, in); - } + return factory.createXMLStreamReader(systemId, in); } catch (XMLStreamException e) { throw new RuntimeException("Couldn't parse stream.", e); + } finally { + returnXMLInputFactory(factory); } } @@ -855,9 +868,12 @@ return new W3CDOMStreamReader(el); } } + XMLInputFactory factory = getXMLInputFactory(); - synchronized (factory) { + try { return factory.createXMLStreamReader(source); + } finally { + returnXMLInputFactory(factory); } } catch (XMLStreamException e) { throw new RuntimeException("Couldn't parse stream.", e); @@ -869,14 +885,13 @@ * @return */ public static XMLStreamReader createXMLStreamReader(Reader reader) { - + XMLInputFactory factory = getXMLInputFactory(); try { - XMLInputFactory factory = getXMLInputFactory(); - synchronized (factory) { - return factory.createXMLStreamReader(reader); - } + return factory.createXMLStreamReader(reader); } catch (XMLStreamException e) { throw new RuntimeException("Couldn't parse stream.", e); + } finally { + returnXMLInputFactory(factory); } } Modified: cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java?rev=794756&r1=794755&r2=794756&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java (original) +++ cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java Thu Jul 16 17:13:22 2009 @@ -19,7 +19,6 @@ package org.apache.cxf.staxutils; -import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; import org.junit.Assert; @@ -29,9 +28,8 @@ @Test public void testReader() throws Exception { - XMLInputFactory ifactory = StaxUtils.getXMLInputFactory(); XMLStreamReader reader = - ifactory.createXMLStreamReader(getClass().getResourceAsStream("./resources/amazon.xml")); + StaxUtils.createXMLStreamReader(getClass().getResourceAsStream("./resources/amazon.xml")); DepthXMLStreamReader dr = new DepthXMLStreamReader(reader); Modified: cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java?rev=794756&r1=794755&r2=794756&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java (original) +++ cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java Thu Jul 16 17:13:22 2009 @@ -19,7 +19,6 @@ package org.apache.cxf.staxutils; -import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; import org.junit.Assert; @@ -29,9 +28,8 @@ @Test public void testReader() throws Exception { - XMLInputFactory ifactory = StaxUtils.getXMLInputFactory(); XMLStreamReader reader = - ifactory.createXMLStreamReader(getClass().getResourceAsStream("./resources/amazon.xml")); + StaxUtils.createXMLStreamReader(getClass().getResourceAsStream("./resources/amazon.xml")); DepthXMLStreamReader dr = new DepthXMLStreamReader(reader); 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=794756&r1=794755&r2=794756&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 Thu Jul 16 17:13:22 2009 @@ -114,8 +114,12 @@ XMLInputFactory inputFactory = StaxInInterceptor.getXMLInputFactory(message); try { XMLStreamReader reader; - synchronized (inputFactory) { - reader = inputFactory.createXMLStreamReader(message.getContent(InputStream.class)); + if (inputFactory == null) { + reader = StaxUtils.createXMLStreamReader(message.getContent(InputStream.class)); + } else { + synchronized (inputFactory) { + reader = inputFactory.createXMLStreamReader(message.getContent(InputStream.class)); + } } doc = StaxUtils.read(reader); } catch (XMLStreamException e) { 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=794756&r1=794755&r2=794756&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 Thu Jul 16 17:13:22 2009 @@ -79,8 +79,12 @@ XMLStreamReader reader; try { XMLInputFactory factory = getXMLInputFactory(message); - synchronized (factory) { - reader = factory.createXMLStreamReader(is, encoding); + if (factory == null) { + reader = StaxUtils.createXMLStreamReader(is, encoding); + } else { + synchronized (factory) { + reader = factory.createXMLStreamReader(is, encoding); + } } } catch (XMLStreamException e) { throw new Fault(new org.apache.cxf.common.i18n.Message("STREAM_CREATE_EXC", @@ -123,8 +127,7 @@ } } return xif; - } else { - return StaxUtils.getXMLInputFactory(); - } + } + return null; } } 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=794756&r1=794755&r2=794756&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 Thu Jul 16 17:13:22 2009 @@ -64,8 +64,12 @@ try { XMLOutputFactory factory = getXMLOutputFactory(message); - synchronized (factory) { - writer = factory.createXMLStreamWriter(os, encoding); + if (factory == null) { + writer = StaxUtils.createXMLStreamWriter(os, encoding); + } else { + 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); @@ -122,9 +126,8 @@ } } return xif; - } else { - return StaxUtils.getXMLOutputFactory(); } + return null; } public class StaxOutEndingInterceptor extends AbstractPhaseInterceptor<Message> { Modified: cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchInDatabindingInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchInDatabindingInterceptor.java?rev=794756&r1=794755&r2=794756&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchInDatabindingInterceptor.java (original) +++ cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchInDatabindingInterceptor.java Thu Jul 16 17:13:22 2009 @@ -409,8 +409,7 @@ XMLStreamReader reader = null; - reader = StaxUtils.getXMLInputFactory().createXMLStreamReader(cos.getInputStream(), - encoding); + reader = StaxUtils.createXMLStreamReader(cos.getInputStream(), encoding); DataReader<XMLStreamReader> dataReader = getDataReader(message); dataReader.setProperty(JAXBDataBinding.UNWRAP_JAXB_ELEMENT, Boolean.FALSE); 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=794756&r1=794755&r2=794756&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 Thu Jul 16 17:13:22 2009 @@ -36,6 +36,7 @@ import org.apache.cxf.io.CachedOutputStream; import org.apache.cxf.message.Message; import org.apache.cxf.phase.Phase; +import org.apache.cxf.staxutils.StaxUtils; public class MediatorInInterceptor extends AbstractEndpointSelectionInterceptor { @@ -64,8 +65,12 @@ XMLStreamReader xsr; XMLInputFactory factory = StaxInInterceptor.getXMLInputFactory(message); - synchronized (factory) { - xsr = factory.createXMLStreamReader(bos.getInputStream(), encoding); + if (factory == null) { + xsr = StaxUtils.createXMLStreamReader(bos.getInputStream(), encoding); + } else { + synchronized (factory) { + xsr = factory.createXMLStreamReader(bos.getInputStream(), encoding); + } } // move to the soap body
