Author: dkulp Date: Tue Jul 17 14:42:37 2012 New Revision: 1362518 URL: http://svn.apache.org/viewvc?rev=1362518&view=rev Log: Merged revisions 1360697 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1360697 | dkulp | 2012-07-12 10:28:50 -0400 (Thu, 12 Jul 2012) | 19 lines Merged revisions 1360674 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1360674 | dkulp | 2012-07-12 09:47:31 -0400 (Thu, 12 Jul 2012) | 11 lines Merged revisions 1360403 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1360403 | dkulp | 2012-07-11 17:15:36 -0400 (Wed, 11 Jul 2012) | 3 lines Change to ArrayBlockingQueue since size doesn't need to change and abq doesn't need to create any objects for offer (less gc contention) ........ ........ ........ Modified: cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java Modified: cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=1362518&r1=1362517&r2=1362518&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java (original) +++ cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java Tue Jul 17 14:42:37 2012 @@ -27,8 +27,8 @@ import java.io.Writer; import java.net.URL; import java.util.Iterator; import java.util.Stack; +import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingQueue; import java.util.logging.Logger; import javax.xml.namespace.NamespaceContext; @@ -116,8 +116,8 @@ public final class StaxUtils { if (i <= 0) { i = 20; } - NS_AWARE_INPUT_FACTORY_POOL = new LinkedBlockingQueue<XMLInputFactory>(i); - OUTPUT_FACTORY_POOL = new LinkedBlockingQueue<XMLOutputFactory>(i); + NS_AWARE_INPUT_FACTORY_POOL = new ArrayBlockingQueue<XMLInputFactory>(i); + OUTPUT_FACTORY_POOL = new ArrayBlockingQueue<XMLOutputFactory>(i); try { String s = System.getProperty(INNER_ELEMENT_LEVEL_SYSTEM_PROP, "-1"); innerElementLevelThreshold = Integer.parseInt(s);
