Author: dkulp
Date: Tue Jul 28 15:50:42 2009
New Revision: 798577
URL: http://svn.apache.org/viewvc?rev=798577&view=rev
Log:
Merged revisions 798562 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r798562 | dkulp | 2009-07-28 11:26:35 -0400 (Tue, 28 Jul 2009) | 1 line
t use the timeouts on the tests. Checking the thread status just doesn't
seem to be working reliably.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 28 15:50:42 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798533,798551,798561
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798533,798551,798561-798562
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?rev=798577&r1=798576&r2=798577&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
Tue Jul 28 15:50:42 2009
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.systest.jms;
-import java.lang.Thread.State;
import java.lang.reflect.UndeclaredThrowableException;
import java.net.URL;
import java.util.ArrayList;
@@ -622,10 +621,6 @@
for (Thread t : threads) {
t.join(10000);
}
- for (Thread t : threads) {
- t.join(1000);
- assertTrue("No terminated state: " + t.getState(), t.getState() ==
State.TERMINATED);
- }
Throwable e = (engClient.getException() != null)
? engClient.getException()
@@ -751,7 +746,7 @@
HelloWorldPortType portEng = service.getPort(portNameEng,
HelloWorldPortType.class);
HelloWorldPortType portSales = service.getPort(portNameSales,
HelloWorldPortType.class);
- for (int i = 0; i < 10; ++i) {
+ for (int i = 0; i < 5; ++i) {
ClientRunnable client = new ClientRunnable(portEng,
"com.mycompany.eng:");
Thread thread = new Thread(client);
threads.add(thread);
@@ -765,13 +760,9 @@
}
for (Thread t : threads) {
- t.join(2000);
+ t.join(10000);
}
- for (Thread t : threads) {
- t.join(1000);
- assertTrue("Not terminated state: " + t.getState(), t.getState()
== State.TERMINATED);
- }
for (ClientRunnable client : clients) {
if (client.getException() != null
@@ -812,8 +803,7 @@
}
for (Thread t : threads) {
- t.join(5000);
- assertTrue("Not terminated state: " + t.getState(), t.getState()
== State.TERMINATED);
+ t.join(10000);
}
for (ClientRunnable client : clients) {
