Index: gms/src/main/java/com/sun/enterprise/mgmt/transport/AbstractNetworkManager.java =================================================================== --- gms/src/main/java/com/sun/enterprise/mgmt/transport/AbstractNetworkManager.java (revision 836) +++ gms/src/main/java/com/sun/enterprise/mgmt/transport/AbstractNetworkManager.java Wed Apr 28 16:52:20 KST 2010 @@ -158,10 +158,11 @@ return localPeerID; } - private static NetworkManager networkManager = null; + //private static NetworkManager networkManager = null; private static NetworkManager findByServiceLoader(String transport) { + NetworkManager networkManager = null; ServiceLoader loader = ServiceLoader.load(NetworkManager.class); Iterator iter = loader.iterator(); @@ -185,6 +186,7 @@ } private static NetworkManager findByClassLoader(String classname) { + NetworkManager networkManager = null; // for jdk 5. just use class loader. try{ Class networkManagerClass = Class.forName(classname); @@ -196,22 +198,21 @@ } public static NetworkManager getInstance(String transport) { - if (networkManager == null) { + NetworkManager networkManager = null; - try { - networkManager = findByServiceLoader(transport); - } catch (Throwable t) { - // jdk 5 will end up here. - } - if (networkManager == null) { - String classname = null; - if (transport.compareToIgnoreCase(GMSConstants.GRIZZLY_GROUP_COMMUNICATION_PROVIDER) == 0) { - classname = "com.sun.enterprise.mgmt.transport.grizzly.GrizzlyNetworkManager"; - } else { - classname = "com.sun.enterprise.mgmt.transport.jxta.JxtaNetworkManager"; - } - networkManager = findByClassLoader(classname); - } + try { + networkManager = findByServiceLoader(transport); + } catch (Throwable t) { + // jdk 5 will end up here. + } + if (networkManager == null) { + String classname = null; + if (transport.compareToIgnoreCase(GMSConstants.GRIZZLY_GROUP_COMMUNICATION_PROVIDER) == 0) { + classname = "com.sun.enterprise.mgmt.transport.grizzly.GrizzlyNetworkManager"; + } else { + classname = "com.sun.enterprise.mgmt.transport.jxta.JxtaNetworkManager"; + } + networkManager = findByClassLoader(classname); + } - } return networkManager; }