[cp-patches] Patch: FYI: no trampolines in java.security

[Tom Tromey]

I'm checking this in to Classpath and libgcj.

This removes the need for trampolines from java.security.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>
        * java/security/Permissions.java (perms): Now package-private.
        * java/security/UnresolvedPermission.java (permissions): Now
        package-private.

Index: java/security/Permissions.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/Permissions.java,v
retrieving revision 1.8
diff -u -r1.8 Permissions.java
--- java/security/Permissions.java 21 Oct 2004 20:22:12 -0000 1.8
+++ java/security/Permissions.java 6 Nov 2004 23:12:54 -0000
@@ -72,12 +72,13 @@
    */
   private PermissionCollection allPermission;
 
+  // Package-private to avoid a trampoline.
   /**
    * This is the <code>Hashtable</code> that contains our collections.
    *
    * @serial maps Class to PermissionCollection
    */
-  private final Hashtable perms = new Hashtable();
+  final Hashtable perms = new Hashtable();
 
   /**
    * This method initializes a new instance of <code>Permissions</code>.
Index: java/security/UnresolvedPermission.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/UnresolvedPermission.java,v
retrieving revision 1.8
diff -u -r1.8 UnresolvedPermission.java
--- java/security/UnresolvedPermission.java 21 Oct 2004 20:22:12 -0000 1.8
+++ java/security/UnresolvedPermission.java 6 Nov 2004 23:12:54 -0000
@@ -216,13 +216,14 @@
    */
   private static final long serialVersionUID = -7176153071733132400L;
 
+  // Package-private to avoid a trampoline.
   /**
    * Hashtable where we store permissions.
    *
    * @serial map of typename to a Vector of permissions (you'd think Sun
    *         would document this better!)
    */
-  private final Hashtable permissions = new Hashtable();
+  final Hashtable permissions = new Hashtable();
 
   /**
    * Add a permission.