Author: alessio.soldano(a)jboss.com Date: 2013-06-24 13:33:29 -0400 (Mon, 24 Jun 2013) New Revision: 17733 Modified: stack/cxf/branches/jbossws-cxf-4.1.x/ stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/TestUtils.java Log: Merged revisions 17627 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r17627 | alessio.soldano(a)jboss.com | 2013-05-29 18:24:02 +0200 (Wed, 29 May 2013) | 2 lines [JBWS-3647] remove from CopyOnWriteArrayList's iterator not supported ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.1.x ___________________________________________________________________ Modified: svnmerge-integrated - /stack/cxf/trunk:1-17199,17236-17242,17244-17245,17247-17255,17259-17334,17336-17345,17348-17350,17352-17361,17363-17364,17367-17379,17382-17414,17416-17426,17428-17433,17435-17452,17454-17469,17471-17477,17479,17481-17482,17484,17487-17490,17492-17493,17501-17504,17506-17520,17522-17523,17529-17530,17539-17549,17552-17553,17556-17580,17582,17586,17591-17592,17596,17606-17608,17612-17614,17618,17621-17626,17628,17630-17638,17640-17644,17646,17648-17665,17667-17672,17677,17679-17685,17687,17690-17705,17707,17709-17711,17713-17715,17717 + /stack/cxf/trunk:1-17199,17236-17242,17244-17245,17247-17255,17259-17334,17336-17345,17348-17350,17352-17361,17363-17364,17367-17379,17382-17414,17416-17426,17428-17433,17435-17452,17454-17469,17471-17477,17479,17481-17482,17484,17487-17490,17492-17493,17501-17504,17506-17520,17522-17523,17529-17530,17539-17549,17552-17553,17556-17580,17582,17586,17591-17592,17596,17606-17608,17612-17614,17618,17621-17628,17630-17638,17640-17644,17646,17648-17665,17667-17672,17677,17679-17685,17687,17690-17705,17707,17709-17711,17713-17715,17717 Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/branches/ropalka:16301-16305,16966-17008 /stack/cxf/branches/ropalka_JBWS-3550:16747-16757 /stack/cxf/trunk:17236,17260-17277,17279,17345,17400-17414,17433,17479,17539,17618,17623,17628,17709-17711,17714-17715,17717 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/branches/ropalka:16301-16305,16966-17008 /stack/cxf/branches/ropalka_JBWS-3550:16747-16757 /stack/cxf/trunk:17236,17260-17277,17279,17345,17400-17414,17433,17479,17539,17618,17623,17627-17628,17709-17711,17714-17715,17717 Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/TestUtils.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/TestUtils.java 2013-06-24 17:32:00 UTC (rev 17732) +++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/TestUtils.java 2013-06-24 17:33:29 UTC (rev 17733) @@ -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()