Author: alessio.soldano(a)jboss.com Date: 2013-06-24 13:31:32 -0400 (Mon, 24 Jun 2013) New Revision: 17731 Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/TestUtils.java Log: Merging rev 17627 shared-testsuite changes from upstream jbossws-cxf stack Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/TestUtils.java =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/TestUtils.java 2013-06-24 16:03:28 UTC (rev 17730) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/TestUtils.java 2013-06-24 17:31:32 UTC (rev 17731) @@ -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()