svn commit: r1362463 - in /river/jtsk/trunk: qa/src/com/sun/jini/qa/resources/qaDefaults.properties src/net/jini/loader/pref/PreferredClassProvider.java

[pe...@apache.org]

Author: peter_firmstone
Date: Tue Jul 17 12:13:24 2012
New Revision: 1362463

URL: http://svn.apache.org/viewvc?rev=1362463&view=rev
Log:
Feeble attempt to fix failing test on Hudson Windows:

com/sun/jini/test/impl/locatordiscovery/BadLocatorDiscoveryListener.td

Reversion of last commit, activate security debugging, lets get some more info.

Modified:
    river/jtsk/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
    river/jtsk/trunk/src/net/jini/loader/pref/PreferredClassProvider.java

Modified: river/jtsk/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties?rev=1362463&r1=1362462&r2=1362463&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties Tue Jul 17 12:13:24 2012
@@ -222,6 +222,7 @@ com.sun.jini.qa.harness.actdeathdelay=5
 # no cosmetic whitespace
 com.sun.jini.qa.harness.globalvmargs=\
 -Djava.ext.dirs=${java.ext.dirs},\
+-Djava.security.debug=access:failure,\
 -Dcom.sun.jini.jsk.port=${com.sun.jini.jsk.port},\
 -Dcom.sun.jini.qa.port=${com.sun.jini.qa.port},\
 -Dcom.sun.jini.jsk.home=${com.sun.jini.jsk.home},\

Modified: river/jtsk/trunk/src/net/jini/loader/pref/PreferredClassProvider.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/net/jini/loader/pref/PreferredClassProvider.java?rev=1362463&r1=1362462&r2=1362463&view=diff
==============================================================================
--- river/jtsk/trunk/src/net/jini/loader/pref/PreferredClassProvider.java (original)
+++ river/jtsk/trunk/src/net/jini/loader/pref/PreferredClassProvider.java Tue Jul 17 12:13:24 2012
@@ -250,7 +250,7 @@ public class PreferredClassProvider exte
     private static String codebaseProperty = null;
     static {
 	String prop = AccessController.doPrivileged(
-           new GetPropertyAction("java.rmi.server.codebase"));
+   new GetPropertyAction("java.rmi.server.codebase"));
 	if (prop != null && prop.trim().length() > 0) {
 	    codebaseProperty = prop;
 	}
@@ -259,26 +259,18 @@ public class PreferredClassProvider exte
     /** table of "local" class loaders */
     private static final Map localLoaders =
 	Collections.synchronizedMap(new WeakHashMap());
-    /** lazy load table of "local" class loaders to avoid java Policy 
-     * initialisation issues */
-    private static volatile boolean loaded = false;
-    static void load() {
-        if (loaded) return;
-        synchronized (localLoaders){
-            if (loaded) return; // Double checked
-            AccessController.doPrivileged(new PrivilegedAction() {
-                public Object run() {
-                    for (ClassLoader loader = ClassLoader.getSystemClassLoader();
-                         loader != null;
-                         loader = loader.getParent())
-                    {
-                        localLoaders.put(loader, null);
-                    }
-                    return null;
-                }
-            });
-            loaded = true;
-        }
+    static {
+	AccessController.doPrivileged(new PrivilegedAction() {
+	    public Object run() {
+		for (ClassLoader loader = ClassLoader.getSystemClassLoader();
+		     loader != null;
+		     loader = loader.getParent())
+		{
+		    localLoaders.put(loader, null);
+		}
+		return null;
+	    }
+	});
     }
 
     /**
@@ -862,7 +854,6 @@ public class PreferredClassProvider exte
      * class loader
      */
     private static boolean isLocalLoader(ClassLoader loader) {
-        load();
 	return (loader == null || localLoaders.containsKey(loader));
     }