Merge GNU Classpath 0.99 into libjava.

From-SVN: r185741

2 files changed, 11 insertions, 6 deletions

diff --git a/libjava/classpath/vm/reference/java/security/VMAccessController.java b/libjava/classpath/vm/reference/java/security/VMAccessController.java
index 9299e6f..6e02f57 100644
--- a/libjava/classpath/vm/reference/java/security/VMAccessController.java
+++ b/libjava/classpath/vm/reference/java/security/VMAccessController.java
@@ -71,7 +71,7 @@ final class VMAccessController
     Permissions permissions = new Permissions();
     permissions.add(new AllPermission());
     ProtectionDomain[] domain = new ProtectionDomain[] {
-      new ProtectionDomain(source, permissions)
+      new ProtectionDomain(source, permissions, null, null)
     };
     DEFAULT_CONTEXT = new AccessControlContext(domain);
   }
@@ -188,12 +188,13 @@ final class VMAccessController
       {
         Class clazz = classes[i];
         String method = methods[i];
+        ClassLoader loader = clazz.getClassLoader();
 
         if (DEBUG)
           {
             debug("checking " + clazz + "." + method);
             // subject to getClassLoader RuntimePermission
-            debug("loader = " + clazz.getClassLoader());
+            debug("loader = " + loader);
           }
 
         // If the previous frame was a call to doPrivileged, then this is
@@ -225,7 +226,8 @@ final class VMAccessController
         // Create a static snapshot of this domain, which may change over time
         // if the current policy changes.
         domains.add(new ProtectionDomain(domain.getCodeSource(),
-                                         domain.getPermissions()));
+                                         domain.getPermissions(),
+                                         loader, null));
       }
 
     if (DEBUG)
diff --git a/libjava/classpath/vm/reference/java/security/VMSecureRandom.java b/libjava/classpath/vm/reference/java/security/VMSecureRandom.java
index bea1549..0a43845 100644
--- a/libjava/classpath/vm/reference/java/security/VMSecureRandom.java
+++ b/libjava/classpath/vm/reference/java/security/VMSecureRandom.java
@@ -1,5 +1,5 @@
 /* VMSecureRandom.java -- random seed generator.
-   Copyright (C) 2006  Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
 
@@ -55,6 +55,8 @@ package java.security;
 final class VMSecureRandom
 {
 
+  private VMSecureRandom() {} // Prohibits instantiation.
+
   /**
    * Generate a random seed. Implementations are free to generate
    * fewer random bytes than are requested, and leave the remaining
@@ -104,7 +106,8 @@ final class VMSecureRandom
     return length;
   }
 
-  static class Spinner implements Runnable
+  static class Spinner
+    implements Runnable
   {
     volatile byte value;
     volatile boolean running;
@@ -121,7 +124,7 @@ final class VMSecureRandom
         value++;
     }
 
-    private void stop()
+    void stop()
     {
       running = false;
     }