You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2011/10/14 05:12:51 UTC

svn commit: r1183215 - in /cxf/branches/2.4.x-fixes: ./ rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java

Author: ningjiang
Date: Fri Oct 14 03:12:50 2011
New Revision: 1183215

URL: http://svn.apache.org/viewvc?rev=1183215&view=rev
Log:
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.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 14 03:12:50 2011
@@ -1 +1 @@
-/cxf/trunk:1183107
+/cxf/trunk:1183107,1183212

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

Modified: cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java?rev=1183215&r1=1183214&r2=1183215&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java Fri Oct 14 03:12:50 2011
@@ -147,7 +147,7 @@ public class AutomaticWorkQueueTest exte
                 }
             }
 
-            while (workqueue.getActiveCount() < DEFAULT_HIGH_WATER_MARK - 1) {
+            while (workqueue.getActiveCount() < DEFAULT_HIGH_WATER_MARK) {
                 try {
                     Thread.sleep(250);
                 } catch (InterruptedException ex) {