Author: asoldano
Date: 2013-11-04 18:15:16 -0500 (Mon, 04 Nov 2013)
New Revision: 18060
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/Helper.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelperUsignThreadLocal.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/LogicalSimpleHandler.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl2.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SimpleHandler.java
Log:
Fixing a bunch of minor potential concurrency issues in the testsuite
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/Helper.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/Helper.java 2013-11-04
23:14:06 UTC (rev 18059)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/Helper.java 2013-11-04
23:15:16 UTC (rev 18060)
@@ -29,6 +29,7 @@
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
@@ -68,12 +69,12 @@
final BusCounter busCounter = new BusCounter();
final ThreadFactory threadFactory = new ThreadFactory()
{
- private volatile int i = 0;
+ private AtomicInteger i = new AtomicInteger(0);
@Override
public Thread newThread(Runnable r)
{
- return new Thread(r, "JBWS3373-thread-" + i++ + "-" +
strategy);
+ return new Thread(r, "JBWS3373-thread-" + i.getAndIncrement() +
"-" + strategy);
}
};
ExecutorService es = Executors.newFixedThreadPool(size, threadFactory);
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelperUsignThreadLocal.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelperUsignThreadLocal.java 2013-11-04
23:14:06 UTC (rev 18059)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelperUsignThreadLocal.java 2013-11-04
23:15:16 UTC (rev 18060)
@@ -29,6 +29,7 @@
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
@@ -69,12 +70,12 @@
final ThreadLocal<HelloWs> port = createPortThreadLocal(wsdlURL, feature,
busCounter);
final ThreadFactory threadFactory = new ThreadFactory()
{
- private volatile int i = 0;
+ private AtomicInteger i = new AtomicInteger(0);
@Override
public Thread newThread(Runnable r)
{
- return new Thread(r, "JBWS3373-TL-thread-" + i++ + "-" +
strategy);
+ return new Thread(r, "JBWS3373-TL-thread-" + i.getAndIncrement() +
"-" + strategy);
}
};
ExecutorService es = Executors.newFixedThreadPool(size, threadFactory);
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/LogicalSimpleHandler.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/LogicalSimpleHandler.java 2013-11-04
23:14:06 UTC (rev 18059)
+++
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/LogicalSimpleHandler.java 2013-11-04
23:15:16 UTC (rev 18060)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.handlerauth;
+import java.util.concurrent.atomic.AtomicInteger;
+
import javax.xml.namespace.QName;
import javax.xml.ws.handler.LogicalHandler;
import javax.xml.ws.handler.LogicalMessageContext;
@@ -28,7 +30,7 @@
public class LogicalSimpleHandler implements LogicalHandler<LogicalMessageContext>
{
- public static volatile int counter = 0;
+ public static AtomicInteger counter = new AtomicInteger(0);
@Override
public boolean handleMessage(LogicalMessageContext context)
@@ -36,7 +38,7 @@
Boolean isOutbound = (Boolean)
context.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
String operation = ((QName)
context.get(MessageContext.WSDL_OPERATION)).getLocalPart();
if (!isOutbound && !operation.equals("getHandlerCounter")) {
- counter++;
+ counter.incrementAndGet();
}
return true;
}
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl.java 2013-11-04
23:14:06 UTC (rev 18059)
+++
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl.java 2013-11-04
23:15:16 UTC (rev 18060)
@@ -90,7 +90,7 @@
}
public int getHandlerCounter() {
- return SimpleHandler.counter;
+ return SimpleHandler.counter.get();
}
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl2.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl2.java 2013-11-04
23:14:06 UTC (rev 18059)
+++
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl2.java 2013-11-04
23:15:16 UTC (rev 18060)
@@ -90,7 +90,7 @@
}
public int getHandlerCounter() {
- return LogicalSimpleHandler.counter;
+ return LogicalSimpleHandler.counter.get();
}
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SimpleHandler.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SimpleHandler.java 2013-11-04
23:14:06 UTC (rev 18059)
+++
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SimpleHandler.java 2013-11-04
23:15:16 UTC (rev 18060)
@@ -22,6 +22,7 @@
package org.jboss.test.ws.jaxws.handlerauth;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.xml.namespace.QName;
import javax.xml.ws.handler.MessageContext;
@@ -30,7 +31,7 @@
public class SimpleHandler implements SOAPHandler<SOAPMessageContext>
{
- public static volatile int counter = 0;
+ public static AtomicInteger counter = new AtomicInteger(0);
@Override
public boolean handleMessage(SOAPMessageContext context)
@@ -38,7 +39,7 @@
Boolean isOutbound = (Boolean)
context.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
String operation = ((QName)
context.get(MessageContext.WSDL_OPERATION)).getLocalPart();
if (!isOutbound && !operation.equals("getHandlerCounter")) {
- counter++;
+ counter.incrementAndGet();
}
return true;
}