Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1753
diff -u -b -B -r1.1753 ChangeLog
--- ChangeLog	6 Jan 2004 09:40:31 -0000	1.1753
+++ ChangeLog	6 Jan 2004 09:53:11 -0000
@@ -1,3 +1,10 @@
+2004-01-06  Michael Koch  <address@hidden>
+
+	* java/lang/SecurityManager.java
+	(currentClassLoader): Use VMSecurityManager to get current class
+	loader.
+	(checkPackageList): Put array length into local variable.
+
 2004-01-06  Per Bothner  <address@hidden>
 
 	* java/util/Date.java (parse):  Fix a number of problems.
Index: java/lang/SecurityManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/SecurityManager.java,v
retrieving revision 1.15
diff -u -b -B -r1.15 SecurityManager.java
--- java/lang/SecurityManager.java	31 Jul 2003 12:03:27 -0000	1.15
+++ java/lang/SecurityManager.java	6 Jan 2004 09:53:11 -0000
@@ -187,8 +187,7 @@
    */
   protected ClassLoader currentClassLoader()
   {
-    Class c = currentLoadedClass();
-    return c != null ? c.getClassLoader() : null;
+    return VMSecurityManager.currentClassLoader();
   }
 
   /**
@@ -1023,8 +1022,9 @@
              index != -1; index = list.indexOf(packageName, index + 1))
           {
             // Exploit package visibility for speed.
-            if (index + packageName.length() == list.length()
-                || list.charAt(index + packageName.length()) == ',')
+	    int packageNameCount = packageName.length();
+            if (index + packageNameCount == list.length()
+                || list.charAt(index + packageNameCount) == ',')
               {
                 checkPermission(p);
                 return;