Index: trunk/modules/luni/src/main/java/java/lang/SecurityManager.java =================================================================== --- trunk/modules/luni/src/main/java/java/lang/SecurityManager.java (revision 527763) +++ trunk/modules/luni/src/main/java/java/lang/SecurityManager.java (working copy) @@ -586,7 +586,7 @@ Class[] classes = Class.getStackClasses(-1, true); for (int i = 0; i < classes.length; i++) { ClassLoader cl = classes[i].getClassLoaderImpl(); - if (!cl.isSystemClassLoader()) { + if (cl != null && !cl.isSystemClassLoader()) { return cl; } } @@ -622,7 +622,7 @@ Class[] classes = Class.getStackClasses(-1, true); for (int i = 0; i < classes.length; i++) { ClassLoader cl = classes[i].getClassLoaderImpl(); - if (!cl.isSystemClassLoader()) { + if (cl != null && !cl.isSystemClassLoader()) { return i; } } @@ -657,7 +657,7 @@ Class[] classes = Class.getStackClasses(-1, true); for (int i = 0; i < classes.length; i++) { ClassLoader cl = classes[i].getClassLoaderImpl(); - if (!cl.isSystemClassLoader()) { + if (cl != null && !cl.isSystemClassLoader()) { return classes[i]; } } Index: trunk/modules/luni/make/exclude.linux.x86.drl =================================================================== --- trunk/modules/luni/make/exclude.linux.x86.drl (revision 527790) +++ trunk/modules/luni/make/exclude.linux.x86.drl (working copy) @@ -1,8 +1,4 @@ org/apache/harmony/luni/tests/java/lang/ThreadTest.java - -#HARMONY-3628 -org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java - org/apache/harmony/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java tests/api/java/net/SocketTest.java Index: trunk/modules/luni/make/exclude.linux.x86_64.drl =================================================================== --- trunk/modules/luni/make/exclude.linux.x86_64.drl (revision 527790) +++ trunk/modules/luni/make/exclude.linux.x86_64.drl (working copy) @@ -1,9 +1,5 @@ org/apache/harmony/luni/tests/java/net/InetAddressTest.java org/apache/harmony/luni/tests/java/lang/ThreadTest.java - -#HARMONY-3628 -org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java - org/apache/harmony/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java tests/api/java/net/SocketTest.java tests/api/java/net/MulticastSocketTest.java Index: trunk/modules/luni/make/exclude.windows.x86.drl =================================================================== --- trunk/modules/luni/make/exclude.windows.x86.drl (revision 527790) +++ trunk/modules/luni/make/exclude.windows.x86.drl (working copy) @@ -1,2 +0,0 @@ -#HARMONY-3628 -org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java Index: trunk/modules/luni/make/exclude.windows.x86_64.drl =================================================================== --- trunk/modules/luni/make/exclude.windows.x86_64.drl (revision 527790) +++ trunk/modules/luni/make/exclude.windows.x86_64.drl (working copy) @@ -1,5 +1,2 @@ -#HARMONY-3628 -org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java - tests/api/java/net/MulticastSocketTest.java tests/api/java/util/ArrayListTest.java