[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: further trampoline fixes

[Kaffe CVS]

PatchSet 5427 
Date: 2004/11/10 11:03:33
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: further trampoline fixes

2004-11-10  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/javax/imageio/spi/ServiceRegistry.java,
        libraries/javalib/javax/naming/directory/BasicAttributes.java:
        Resynced with GNU Classpath.

        2004-11-06  Tom Tromey  <tromey at redhat.com>

        * javax/naming/directory/BasicAttributes.java (attributes): Now
        package-private.
        * javax/imageio/spi/ServiceRegistry.java (categories): Now
        package-private.

Members: 
	ChangeLog:1.2976->1.2977 
	libraries/javalib/javax/imageio/spi/ServiceRegistry.java:1.2->1.3 
	libraries/javalib/javax/naming/directory/BasicAttributes.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2976 kaffe/ChangeLog:1.2977
--- kaffe/ChangeLog:1.2976	Wed Nov 10 10:50:38 2004
+++ kaffe/ChangeLog	Wed Nov 10 11:03:33 2004
@@ -1,5 +1,18 @@
 2004-11-10  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/javax/imageio/spi/ServiceRegistry.java,
+	libraries/javalib/javax/naming/directory/BasicAttributes.java:
+	Resynced with GNU Classpath.
+
+	2004-11-06  Tom Tromey  <tromey at redhat.com>
+
+        * javax/naming/directory/BasicAttributes.java (attributes): Now
+        package-private.
+        * javax/imageio/spi/ServiceRegistry.java (categories): Now
+        package-private.
+
+2004-11-10  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/net/URLClassLoader.java,
 	libraries/javalib/java/nio/charset/CoderResult.java,
 	libraries/javalib/java/rmi/server/RMIClassLoader.java,
Index: kaffe/libraries/javalib/javax/imageio/spi/ServiceRegistry.java
diff -u kaffe/libraries/javalib/javax/imageio/spi/ServiceRegistry.java:1.2 kaffe/libraries/javalib/javax/imageio/spi/ServiceRegistry.java:1.3
--- kaffe/libraries/javalib/javax/imageio/spi/ServiceRegistry.java:1.2	Mon Oct  4 15:36:10 2004
+++ kaffe/libraries/javalib/javax/imageio/spi/ServiceRegistry.java	Wed Nov 10 11:03:35 2004
@@ -62,6 +62,7 @@
  */
 public class ServiceRegistry
 {
+  // Package-private to avoid a trampoline.
   /**
    * The service categories of this registry.
    *
@@ -73,7 +74,7 @@
    *
    * @see #providers
    */
-  private final Class[] categories;
+  final Class[] categories;
 
 
   /**
Index: kaffe/libraries/javalib/javax/naming/directory/BasicAttributes.java
diff -u kaffe/libraries/javalib/javax/naming/directory/BasicAttributes.java:1.5 kaffe/libraries/javalib/javax/naming/directory/BasicAttributes.java:1.6
--- kaffe/libraries/javalib/javax/naming/directory/BasicAttributes.java:1.5	Sat Oct 23 21:23:16 2004
+++ kaffe/libraries/javalib/javax/naming/directory/BasicAttributes.java	Wed Nov 10 11:03:35 2004
@@ -185,7 +185,8 @@
 
   // This is set by the serialization spec.
   private boolean ignoreCase;
-  private transient Vector attributes;
+  // Package-private to avoid a trampoline.
+  transient Vector attributes;
 
   // Used when enumerating.
   private class BasicAttributesEnumeration implements NamingEnumeration