diff options
Diffstat (limited to 'libjava/gnu/java')
| -rw-r--r-- | libjava/gnu/java/rmi/server/ConnectionRunnerPool.java | 5 | ||||
| -rw-r--r-- | libjava/gnu/java/rmi/server/UnicastConnectionManager.java | 8 | ||||
| -rw-r--r-- | libjava/gnu/java/rmi/server/UnicastRemoteCall.java | 5 |
3 files changed, 11 insertions, 7 deletions
diff --git a/libjava/gnu/java/rmi/server/ConnectionRunnerPool.java b/libjava/gnu/java/rmi/server/ConnectionRunnerPool.java index af7dc0501ae..5f5da8ca941 100644 --- a/libjava/gnu/java/rmi/server/ConnectionRunnerPool.java +++ b/libjava/gnu/java/rmi/server/ConnectionRunnerPool.java @@ -1,5 +1,5 @@ /* 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. @@ -95,7 +95,8 @@ class ConnectionRunnerPool private static int size = 5; 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"); diff --git a/libjava/gnu/java/rmi/server/UnicastConnectionManager.java b/libjava/gnu/java/rmi/server/UnicastConnectionManager.java index 2c1f5fc3a02..cf08a08ab5b 100644 --- a/libjava/gnu/java/rmi/server/UnicastConnectionManager.java +++ b/libjava/gnu/java/rmi/server/UnicastConnectionManager.java @@ -65,8 +65,9 @@ public class UnicastConnectionManager private static String localhost; // use different maps for server/client type UnicastConnectionManager private static Hashtable servers = new Hashtable(); -private static Hashtable clients = new Hashtable(); -private ArrayList connections; //client connection pool +// Package-private to avoid trampolines. +static Hashtable clients = new Hashtable(); +ArrayList connections; //client connection pool // make serverThread volatile for poll private volatile Thread serverThread; @@ -74,7 +75,8 @@ private ServerSocket ssock; String serverName; 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 Object serverobj; diff --git a/libjava/gnu/java/rmi/server/UnicastRemoteCall.java b/libjava/gnu/java/rmi/server/UnicastRemoteCall.java index 78442952ee4..abbe0272544 100644 --- a/libjava/gnu/java/rmi/server/UnicastRemoteCall.java +++ b/libjava/gnu/java/rmi/server/UnicastRemoteCall.java @@ -61,8 +61,9 @@ public class UnicastRemoteCall private Object object; private int opnum; private long hash; - private Vector vec; - private int ptr; + // These are package-private due to inner class access. + Vector vec; + int ptr; private ObjID objid; private ObjectOutput oout; |
