diff options
author | Tom Tromey <tromey@redhat.com> | 2004-11-06 23:38:51 +0000 |
---|---|---|
committer | Tom Tromey <tromey@gcc.gnu.org> | 2004-11-06 23:38:51 +0000 |
commit | 9ec0f3c8f52b3b940a038d8659c39c5f5e4a55f3 (patch) | |
tree | 212e276d4ff35aca891fa4b45b72f395dae6b550 /libjava/gnu | |
parent | ab6036c8fb201ae9e50c0fc442606feea30988fe (diff) | |
download | gcc-9ec0f3c8f52b3b940a038d8659c39c5f5e4a55f3.zip gcc-9ec0f3c8f52b3b940a038d8659c39c5f5e4a55f3.tar.gz gcc-9ec0f3c8f52b3b940a038d8659c39c5f5e4a55f3.tar.bz2 |
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
Diffstat (limited to 'libjava/gnu')
4 files changed, 13 insertions, 8 deletions
diff --git a/libjava/gnu/classpath/ServiceFactory.java b/libjava/gnu/classpath/ServiceFactory.java index 5d14934..e2faef9 100644 --- a/libjava/gnu/classpath/ServiceFactory.java +++ b/libjava/gnu/classpath/ServiceFactory.java @@ -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> * framework. This call returns very quickly if no log message will @@ -542,7 +543,7 @@ public final class ServiceFactory * <code>null</code> if the log message is not associated with a * 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; diff --git a/libjava/gnu/java/rmi/server/ConnectionRunnerPool.java b/libjava/gnu/java/rmi/server/ConnectionRunnerPool.java index af7dc05..5f5da8c 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 2c1f5fc..cf08a08 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 7844295..abbe027 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; |