java.net.preferIPv6Addresses=true test

h2/src/main/org/h2/util/NetUtils.java

@@ -8,6 +8,7 @@ package org.h2.util;
 
 import java.io.IOException;
 import java.net.BindException;
+import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
@@ -47,7 +48,24 @@ public class NetUtils {
         if (address == null) {
             address = InetAddress.getLocalHost();
         }
-        return createSocket(address.getHostAddress(), port, ssl);
+        return createSocket(getHostAddress(address), port, ssl);
+    }
+
+    /**
+     * Get the host address. This method adds '[' and ']' if required for
+     * Inet6Address that contain a ':'.
+     *
+     * @param address the address
+     * @return the host address
+     */
+    public static String getHostAddress(InetAddress address) {
+        String host = address.getHostAddress();
+        if (address instanceof Inet6Address) {
+            if (host.indexOf(':') >= 0 && !host.startsWith("[")) {
+                host = "[" + host + "]";
+            }
+        }
+        return host;
     }
 
     /**
@@ -210,7 +228,7 @@ public class NetUtils {
         } catch (UnknownHostException e) {
             // ignore
         }
-        String address = bind == null ? "localhost" : bind.getHostAddress();
+        String address = bind == null ? "localhost" : getHostAddress(bind);
         if (address.equals("127.0.0.1")) {
             address = "localhost";
         }

h2/src/test/org/h2/test/TestAll.java

@@ -293,9 +293,7 @@ java org.h2.test.TestAll timer
 
 /*
 
-shell tool: document encoding problem.
-mac: java -Dfile.encoding=UTF-8
-windows:
+test what is wrong with -Djava.net.preferIPv6Addresses=true
 
 download checksums (auto-verify every day)
 

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -590,4 +590,4 @@ overall httpdocs tigris eclemma separates underscore yajsw she her truncating
 relocating smtps smtp osde joist catching guesses delimiters shortlist sheet
 rowspan cheat partitioning datepart dreamsource toussi locates fred
 longnvarchar collate localdb nan bootclasspath bcp retrotranslator iterable
-ops jopr googlegroups fletcher
+ops jopr googlegroups fletcher prefer djava
\ No newline at end of file