Author: alessio.soldano(a)jboss.com Date: 2013-06-24 13:32:00 -0400 (Mon, 24 Jun 2013) New Revision: 17732 Modified: common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/deployment/DefaultDeployment.java common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java Log: svn merge -r 17625:17626 https://svn.jboss.org/repos/jbossws/common/trunk . Modified: common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java =================================================================== --- common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java 2013-06-24 17:31:32 UTC (rev 17731) +++ common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java 2013-06-24 17:32:00 UTC (rev 17732) @@ -79,7 +79,7 @@ } @Override - public void setConfigProperties(Object proxy, String configFile, String configName) + public void setConfigProperties(Object client, String configFile, String configName) { throw MESSAGES.operationNotSupportedBy("setConfigProperties", this.getClass()); } Modified: common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/deployment/DefaultDeployment.java =================================================================== --- common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/deployment/DefaultDeployment.java 2013-06-24 17:31:32 UTC (rev 17731) +++ common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/deployment/DefaultDeployment.java 2013-06-24 17:32:00 UTC (rev 17732) @@ -52,7 +52,7 @@ DefaultDeployment(String name, ClassLoader classLoader) { - super(8, 4); + super(12, 4); simpleName = name; state = DeploymentState.UNDEFINED; initialLoader = classLoader; Modified: common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java =================================================================== --- common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2013-06-24 17:31:32 UTC (rev 17731) +++ common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2013-06-24 17:32:00 UTC (rev 17732) @@ -26,9 +26,8 @@ import java.net.Inet6Address; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; import javax.management.MBeanServer; import javax.management.ObjectName; @@ -76,9 +75,9 @@ //The stack config protected StackConfig stackConfig; // The default endpoint configs, if any - private final List<ClientConfig> clientConfigs = Collections.synchronizedList(new ArrayList<ClientConfig>(2)); + private final List<ClientConfig> clientConfigs = new CopyOnWriteArrayList<ClientConfig>(); // The default endpoint configs, if any - private final List<EndpointConfig> endpointConfigs = Collections.synchronizedList(new ArrayList<EndpointConfig>(3)); + private final List<EndpointConfig> endpointConfigs = new CopyOnWriteArrayList<EndpointConfig>(); // The server integration classloader' ServerConfig instance reference private static ServerConfig serverConfig;