diff -r fd16c54261b3 -r 90ce3da70b43 jdk/test/java/net/InetAddress/GetLoopbackAddress.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/net/InetAddress/GetLoopbackAddress.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2006 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 6376404
+ * @summary InetAddress needs a getLoopbackAddress
+ */
+import java.net.*;
+
+public class GetLoopbackAddress
+{
+    static InetAddress IPv4Loopback;
+    static InetAddress IPv6Loopback;
+
+    static {
+        try {
+            IPv4Loopback = InetAddress.getByAddress(
+                new byte[] {0x7F,0x00,0x00,0x01});
+
+            IPv6Loopback = InetAddress.getByAddress(
+                new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01});
+        } catch (UnknownHostException e) {
+        }
+    }
+
+    public static void main(String[] args) {
+        InetAddress addr = InetAddress.getLoopbackAddress();
+
+        if (!(addr.equals(IPv4Loopback) || addr.equals(IPv6Loopback)))
+            throw new RuntimeException("Failed: getLoopbackAddress" +
+                 " not returning a valid loopback address");
+
+        InetAddress addr2 = InetAddress.getLoopbackAddress();
+
+        if (addr != addr2)
+            throw new RuntimeException("Failed: getLoopbackAddress" +
+                " should return a reference to the same InetAddress loopback instance.");
+    }
+}