Author: ningjiang Date: Fri Oct 14 03:45:35 2011 New Revision: 1183216 URL: http://svn.apache.org/viewvc?rev=1183216&view=rev Log: Merged revisions 1183215 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1183215 | ningjiang | 2011-10-14 11:12:50 +0800 (Fri, 14 Oct 2011) | 9 lines Merged revisions 1183212 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1183212 | ningjiang | 2011-10-14 10:53:08 +0800 (Fri, 14 Oct 2011) | 1 line Try to fix the AutomaticWorkQueueTest test failure ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Oct 14 03:45:35 2011 @@ -0,0 +1,2 @@ +/cxf/branches/2.4.x-fixes:1183215 +/cxf/trunk:1183212 Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java?rev=1183216&r1=1183215&r2=1183216&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java (original) +++ cxf/branches/2.3.x-fixes/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java Fri Oct 14 03:45:35 2011 @@ -147,7 +147,7 @@ public class AutomaticWorkQueueTest exte } } - while (workqueue.getActiveCount() < INITIAL_SIZE) { + while (workqueue.getActiveCount() < DEFAULT_HIGH_WATER_MARK) { try { Thread.sleep(250); } catch (InterruptedException ex) {
