Commit 9ec0f3c8 by Tom Tromey Committed by Tom Tromey

UnicastConnectionManager.java (clients): Now package-private.

	* gnu/java/rmi/server/UnicastConnectionManager.java (clients): Now
	package-private.
	(connections): Likewise.
	(scavenger): Likewise.
	* gnu/java/rmi/server/ConnectionRunnerPool.java (freelist): Now
	package-private.
	* gnu/java/rmi/server/UnicastRemoteCall.java (vec): Now
	package-private.
	(ptr): Likewise.
	* gnu/classpath/ServiceFactory.java (log): Now package-private.

From-SVN: r90206
parent ab6036c8
2004-11-06 Tom Tromey <tromey@redhat.com> 2004-11-06 Tom Tromey <tromey@redhat.com>
* gnu/java/rmi/server/UnicastConnectionManager.java (clients): Now
package-private.
(connections): Likewise.
(scavenger): Likewise.
* gnu/java/rmi/server/ConnectionRunnerPool.java (freelist): Now
package-private.
* gnu/java/rmi/server/UnicastRemoteCall.java (vec): Now
package-private.
(ptr): Likewise.
* gnu/classpath/ServiceFactory.java (log): Now package-private.
2004-11-06 Tom Tromey <tromey@redhat.com>
* javax/naming/directory/BasicAttributes.java (attributes): Now * javax/naming/directory/BasicAttributes.java (attributes): Now
package-private. package-private.
* javax/imageio/spi/ServiceRegistry.java (categories): Now * javax/imageio/spi/ServiceRegistry.java (categories): Now
......
...@@ -521,6 +521,7 @@ public final class ServiceFactory ...@@ -521,6 +521,7 @@ public final class ServiceFactory
} }
// Package-private to avoid a trampoline.
/** /**
* Passes a log message to the <code>java.util.logging</code> * Passes a log message to the <code>java.util.logging</code>
* framework. This call returns very quickly if no log message will * framework. This call returns very quickly if no log message will
...@@ -542,7 +543,7 @@ public final class ServiceFactory ...@@ -542,7 +543,7 @@ public final class ServiceFactory
* <code>null</code> if the log message is not associated with a * <code>null</code> if the log message is not associated with a
* Throwable. * Throwable.
*/ */
private static void log(Level level, String msg, Object param, Throwable t) static void log(Level level, String msg, Object param, Throwable t)
{ {
LogRecord rec; LogRecord rec;
......
/* gnu.java.rmi.server.ConnectionRunnerPool /* gnu.java.rmi.server.ConnectionRunnerPool
Copyright (C) 2002 Free Software Foundation, Inc. Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
...@@ -95,7 +95,8 @@ class ConnectionRunnerPool ...@@ -95,7 +95,8 @@ class ConnectionRunnerPool
private static int size = 5; private static int size = 5;
private static int max_size = 10; private static int max_size = 10;
private static ArrayList freelist; // Package-private to avoid a trampoline.
static ArrayList freelist;
private static ThreadGroup group = new ThreadGroup("pool"); private static ThreadGroup group = new ThreadGroup("pool");
......
...@@ -65,8 +65,9 @@ public class UnicastConnectionManager ...@@ -65,8 +65,9 @@ public class UnicastConnectionManager
private static String localhost; private static String localhost;
// use different maps for server/client type UnicastConnectionManager // use different maps for server/client type UnicastConnectionManager
private static Hashtable servers = new Hashtable(); private static Hashtable servers = new Hashtable();
private static Hashtable clients = new Hashtable(); // Package-private to avoid trampolines.
private ArrayList connections; //client connection pool static Hashtable clients = new Hashtable();
ArrayList connections; //client connection pool
// make serverThread volatile for poll // make serverThread volatile for poll
private volatile Thread serverThread; private volatile Thread serverThread;
...@@ -74,7 +75,8 @@ private ServerSocket ssock; ...@@ -74,7 +75,8 @@ private ServerSocket ssock;
String serverName; String serverName;
int serverPort; int serverPort;
static private Thread scavenger; // Package-private to avoid a trampoline.
static Thread scavenger;
// If client and server are in the same VM, serverobj represents server // If client and server are in the same VM, serverobj represents server
Object serverobj; Object serverobj;
......
...@@ -61,8 +61,9 @@ public class UnicastRemoteCall ...@@ -61,8 +61,9 @@ public class UnicastRemoteCall
private Object object; private Object object;
private int opnum; private int opnum;
private long hash; private long hash;
private Vector vec; // These are package-private due to inner class access.
private int ptr; Vector vec;
int ptr;
private ObjID objid; private ObjID objid;
private ObjectOutput oout; private ObjectOutput oout;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment