UnicastConnectionManager.java (UnicastConnectionManager(int port, RMIServerSocketFact...

2007-04-17  Andrew Haley  <aph@redhat.com>

	* gnu/java/rmi/server/UnicastConnectionManager.java
	(UnicastConnectionManager(int port, RMIServerSocketFactory)):
	Listen on "localhost", not localhost.

From-SVN: r123952

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 244b98d..fac684a 100644 (file)
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-17  Andrew Haley  <aph@redhat.com>
+
+       * gnu/java/rmi/server/UnicastConnectionManager.java
+       (UnicastConnectionManager(int port, RMIServerSocketFactory)):
+       Listen on "localhost", not localhost.
+
 2007-04-17  Francis Kung  <fkung@redhat.com>
 
        PR classpath/31311

diff --git a/libjava/classpath/gnu/java/rmi/server/UnicastConnectionManager.java b/libjava/classpath/gnu/java/rmi/server/UnicastConnectionManager.java
index 9715d4a..a9992af 100644 (file)
--- a/libjava/classpath/gnu/java/rmi/server/UnicastConnectionManager.java
+++ b/libjava/classpath/gnu/java/rmi/server/UnicastConnectionManager.java
@@ -181,7 +181,13 @@ private UnicastConnectionManager(int port, RMIServerSocketFactory ssf) throws Re
                serverPort = 0;
                throw new java.rmi.server.ExportException("can not create Server Socket on port " + port,ioex);
        }
-       serverName = localhost;
+       // Note that for compatibility the serverName is "localhost",
+       // not UnicastConnectionManager.localhost, which is the name
+       // of the local box.  A server listening on localhost:port is
+       // listening on the loopback interface, 127.0.0.1, but
+       // UnicastConnectionManager.localhost is an externally
+       // accessible IP address.
+       serverName = "localhost";
        serverFactory = ssf;
        clientFactory = null;
 }