Author: ningjiang
Date: Fri Sep 23 02:44:15 2011
New Revision: 1174503
URL: http://svn.apache.org/viewvc?rev=1174503&view=rev
Log:
Merged revisions 1174502 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1174502 | ningjiang | 2011-09-23 10:27:47 +0800 (Fri, 23 Sep 2011) | 1 line
Try to fixed the unit test error on the slower CI box
........
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 Sep 23 02:44:15 2011
@@ -1 +1 @@
-/cxf/trunk:1173863-1173871,1174109,1174210,1174404
+/cxf/trunk:1173863-1173871,1174109,1174210,1174404,1174502
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=1174503&r1=1174502&r2=1174503&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 Sep 23 02:44:15 2011
@@ -147,7 +147,7 @@ public class AutomaticWorkQueueTest exte
}
}
- while (workqueue.getActiveCount() < INITIAL_SIZE) {
+ while (workqueue.getActiveCount() < 0) {
try {
Thread.sleep(250);
} catch (InterruptedException ex) {
