harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From py...@apache.org
Subject svn commit: r528382 - in /harmony/enhanced/classlib/trunk/modules/luni: make/exclude.linux.x86.drl make/exclude.linux.x86_64.drl make/exclude.windows.x86.drl make/exclude.windows.x86_64.drl src/main/java/java/lang/SecurityManager.java
Date Fri, 13 Apr 2007 08:11:09 GMT
Author: pyang
Date: Fri Apr 13 01:11:08 2007
New Revision: 528382

URL: http://svn.apache.org/viewvc?view=rev&rev=528382
Log:
Apply patch for HARMONY-3628( [classlib][luni] API test org.apache.harmony.luni.tests.java.lang.SecurityManagerTest
failed on DRLVM)

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.drl
    harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/SecurityManager.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.drl?view=diff&rev=528382&r1=528381&r2=528382
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.drl Fri Apr 13 01:11:08
2007
@@ -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
 

Modified: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.drl?view=diff&rev=528382&r1=528381&r2=528382
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.drl Fri Apr 13
01:11:08 2007
@@ -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

Modified: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86.drl?view=diff&rev=528382&r1=528381&r2=528382
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86.drl Fri Apr 13 01:11:08
2007
@@ -1,2 +0,0 @@
-#HARMONY-3628
-org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.drl?view=diff&rev=528382&r1=528381&r2=528382
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.drl Fri Apr 13
01:11:08 2007
@@ -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

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/SecurityManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/SecurityManager.java?view=diff&rev=528382&r1=528381&r2=528382
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/SecurityManager.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/SecurityManager.java
Fri Apr 13 01:11:08 2007
@@ -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];
             }
         }



Mime
View raw message