--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/rmi/invalidName/InvalidName.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,95 @@
+/*
+ * Copyright 1998-1999 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 4136563
+ * @summary Naming.lookup fails to throw exception for invalid hostname
+ *
+ * @bug 4208801
+ * @summary (1.x) java.rmi.Naming defaults to local hostname, not
+ *          local IP address
+ *
+ * @author Laird Dornin
+ *
+ * @library ../testlibrary
+ * @build InvalidName
+ * @run main/othervm InvalidName
+ */
+
+import java.net.URL;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.rmi.registry.Registry;
+import java.rmi.Naming;
+import java.rmi.Remote;
+import java.rmi.server.RemoteObject;
+import java.rmi.server.UnicastRemoteObject;
+
+public class InvalidName {
+    public static void main(String[] args) {
+
+        String testName;
+
+        // ensure that an exception is thrown for Naming URL with '#'
+        try {
+
+            System.err.println("\nRegression test for bugs " +
+                               "4136563 and 4208801\n");
+
+            testName = new String("rmi://#/MyRMI");
+
+            Naming.lookup(testName);
+            System.err.println("no exception thrown for URL: " + testName);
+            throw new RuntimeException("test failed");
+
+        } catch (MalformedURLException e) {
+            // should have received malformed URL exception
+            System.err.println("Correctly received instance of " +
+                               "MalformedURLException:");
+            System.err.println(e.getMessage());
+            e.printStackTrace();
+
+        } catch (Exception e) {
+            TestLibrary.bomb(e);
+        }
+
+        // ensure a correct null pointer exception is thrown for null URL
+        // ensure that a registry stub with a default hostname and one with a
+        // the local host's ip address are .equals()
+        try {
+            String localAddress =  InetAddress.getLocalHost().getHostAddress();
+
+            Registry registry = (Registry) Naming.lookup("rmi:///");
+
+            if (registry.toString().indexOf(localAddress) >= 0) {
+                System.err.println("verified registry endpoint contains ipaddress");
+            } else {
+                TestLibrary.bomb("registry endpoint does not contain ipaddress");
+            }
+        } catch (Exception e) {
+            TestLibrary.bomb(e);
+        }
+
+        System.err.println("test passed");
+    }
+}