* Attempt to increase the probability of observing the issue described in AXIS-2498 in MultithreadTestCase.

veithen · veithen · commit 03cacde91ecb · 2012-10-21T13:25:00.000Z
* Ensure that MultithreadTestCase will report hanging threads (instead of blocking the build).
diff --git a/integration/src/test/java/test/wsdl/multithread/Invoker.java b/integration/src/test/java/test/wsdl/multithread/Invoker.java
@@ -18,6 +18,8 @@
  */
 package test.wsdl.multithread;
 
+import java.util.concurrent.CountDownLatch;
+
 import org.apache.axis.components.logger.LogFactory;
 import org.apache.commons.logging.Log;
 
@@ -30,15 +32,24 @@ class Invoker implements Runnable {
     private static Log log = LogFactory.getLog(Invoker.class.getName());
     
     private final AddressBook binding;
+    private final CountDownLatch readyLatch;
+    private final CountDownLatch startLatch;
     private final Report report;
     
-    Invoker(AddressBook binding, Report report) {
+    Invoker(AddressBook binding, CountDownLatch readyLatch, CountDownLatch startLatch, Report report) {
         this.binding = binding;
+        this.readyLatch = readyLatch;
+        this.startLatch = startLatch;
         this.report = report;
     }
 
     public void run() {
         try {
+            // This ensures that all threads start sending requests at the same time,
+            // thereby increasing the probability of triggering a concurrency issue.
+            readyLatch.countDown();
+            startLatch.await();
+            
             for (int i = 0; i < 4; ++i) {
                 Address address = new Address();
                 Phone phone = new Phone();
diff --git a/integration/src/test/java/test/wsdl/multithread/MultithreadTestCase.java b/integration/src/test/java/test/wsdl/multithread/MultithreadTestCase.java
@@ -1,5 +1,7 @@
 package test.wsdl.multithread;
 
+import java.util.concurrent.CountDownLatch;
+
 import junit.framework.TestCase;
 import samples.addr.AddressBook;
 import samples.addr.AddressBookSOAPBindingStub;
@@ -44,16 +46,22 @@ public AddressBook getStub() throws Exception {
     private void testMultithreading(StubSupplier stubSupplier) throws Throwable {
         Report report = new Report();
         int NUM_THREADS = 50;
+        CountDownLatch readyLatch = new CountDownLatch(NUM_THREADS);
+        CountDownLatch startLatch = new CountDownLatch(1);
         Thread[] threads = new Thread[NUM_THREADS];
         for (int i = 0; i < NUM_THREADS; ++i) {
-            threads[i] = new Thread(new Invoker(stubSupplier.getStub(), report));
+            threads[i] = new Thread(new Invoker(stubSupplier.getStub(), readyLatch, startLatch, report));
             threads[i].start();
         }
+        readyLatch.await();
+        startLatch.countDown();
         for (int i = 0; i < NUM_THREADS; ++i) {
-            try {
-                threads[i].join();
-            }
-            catch (InterruptedException ie) {
+            threads[i].join(30000);
+            StackTraceElement[] stack = threads[i].getStackTrace();
+            if (stack.length > 0) {
+                Throwable t = new Throwable("Hanging thread detected");
+                t.setStackTrace(stack);
+                throw t;
             }
         }
         Throwable error = report.getError();
