Author: alessio.soldano(a)jboss.com
Date: 2013-05-29 12:24:02 -0400 (Wed, 29 May 2013)
New Revision: 17627
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/TestUtils.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/TestUtils.java
Log:
[JBWS-3647] remove from CopyOnWriteArrayList's iterator not supported
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/TestUtils.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/TestUtils.java 2013-05-29
16:22:56 UTC (rev 17626)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/TestUtils.java 2013-05-29
16:24:02 UTC (rev 17627)
@@ -83,14 +83,19 @@
}
public static void removeTestCaseClientConfiguration(String testConfigName) {
- Iterator<ClientConfig> it = getServerConfig().getClientConfigs().iterator();
+ ServerConfig sc = getServerConfig();
+ Iterator<ClientConfig> it = sc.getClientConfigs().iterator();
+ ClientConfig toBeRemoved = null;
while (it.hasNext()) {
ClientConfig c = it.next();
if (testConfigName.equals(c.getConfigName())) {
- it.remove();
+ toBeRemoved = c;
break;
}
}
+ if (toBeRemoved != null) {
+ sc.getClientConfigs().remove(toBeRemoved);
+ }
}
private static ServerConfig getServerConfig()
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/TestUtils.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/TestUtils.java 2013-05-29
16:22:56 UTC (rev 17626)
+++
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/TestUtils.java 2013-05-29
16:24:02 UTC (rev 17627)
@@ -109,14 +109,19 @@
}
public static void removeTestCaseClientConfiguration(String testConfigName) {
- Iterator<ClientConfig> it = getServerConfig().getClientConfigs().iterator();
+ ServerConfig sc = getServerConfig();
+ Iterator<ClientConfig> it = sc.getClientConfigs().iterator();
+ ClientConfig toBeRemoved = null;
while (it.hasNext()) {
ClientConfig c = it.next();
if (testConfigName.equals(c.getConfigName())) {
- it.remove();
+ toBeRemoved = c;
break;
}
}
+ if (toBeRemoved != null) {
+ sc.getClientConfigs().remove(toBeRemoved);
+ }
}
private static ServerConfig getServerConfig()
Show replies by date