Fix another concurrency issue similar to AXIS-2850 and ensure that stubs are thread safe.

veithen · veithen · commit c4af21a3aac8 · 2015-07-06T19:01:34.000Z
diff --git a/axis-rt-core/src/main/java/org/apache/axis/client/Stub.java b/axis-rt-core/src/main/java/org/apache/axis/client/Stub.java
@@ -432,11 +432,14 @@ public Service _getService() {
      * @return
      */
     public Call _createCall() throws ServiceException {
-        _call = (Call) service.createCall();
+        // A single stub instance may be used concurrently by multiple threads; therefore we need
+        // to return the value of the local call variable instead of reading the _call attribute.
+        Call call = (Call) service.createCall();
+        _call = call;
 
         // TODO: There is a lot of code in the generated stubs that
         // can be moved here.
-        return _call;
+        return call;
     }
 
     /**
diff --git a/integration/src/test/java/test/wsdl/multithread/MultithreadTestCase.java b/integration/src/test/java/test/wsdl/multithread/MultithreadTestCase.java
@@ -46,7 +46,7 @@ public AddressBook getStub() throws Exception {
     private void testMultithreading(StubSupplier stubSupplier) throws Throwable {
         Report report = new Report();
         final int numThreads = 50;
-        final int numInvocations = 4;
+        final int numInvocations = 10;
         CountDownLatch readyLatch = new CountDownLatch(numThreads);
         CountDownLatch startLatch = new CountDownLatch(1);
         Thread[] threads = new Thread[numThreads];
