|
|
|
1 |
# HG changeset patch |
# HG changeset patch |
2 |
# User robm |
# User robm |
3 |
# Date 1430151427 -3600 |
# Date 1430151427 -3600 |
4 |
# Node ID b02550d62bdbaf61a258628b47acc3fc7982d7e5 |
# Mon Apr 27 17:17:07 2015 +0100 |
5 |
# Parent 70aaa6da3101e6c2feeabce3b36d50624ed918ad |
# Node ID 25793dbc656988d6e20c9b2653790ce25b8bee03 |
6 |
6991580: IPv6 Nameservers in resolv.conf throws NumberFormatException |
# Parent ea26a8f4db7e20b97340b7e76e3126b3a3493307 |
7 |
|
6991580, PR2403: IPv6 Nameservers in resolv.conf throws NumberFormatException |
8 |
Reviewed-by: michaelm, andrew, alanb, rriggs |
Reviewed-by: michaelm, andrew, alanb, rriggs |
9 |
Contributed-by: sgehwolf@redhat.com |
Contributed-by: sgehwolf@redhat.com |
10 |
|
|
11 |
diff -r 70aaa6da3101 -r b02550d62bdb src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java |
diff -r ea26a8f4db7e -r 25793dbc6569 src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java |
12 |
--- jdk8/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java Sun Apr 19 10:31:06 2015 +0300 |
--- openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java Thu Jun 04 20:13:40 2015 +0100 |
13 |
+++ jdk8/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java Mon Apr 27 17:17:07 2015 +0100 |
+++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java Mon Apr 27 17:17:07 2015 +0100 |
14 |
@@ -85,6 +85,15 @@ |
@@ -85,6 +85,15 @@ |
15 |
if (val.charAt(0) == '#' || val.charAt(0) == ';') { |
if (val.charAt(0) == '#' || val.charAt(0) == ';') { |
16 |
break; |
break; |
27 |
ll.add(val); |
ll.add(val); |
28 |
if (--maxvalues == 0) { |
if (--maxvalues == 0) { |
29 |
break; |
break; |
30 |
diff -r 70aaa6da3101 -r b02550d62bdb test/com/sun/jndi/dns/IPv6NameserverPlatformParsingTest.java |
diff -r ea26a8f4db7e -r 25793dbc6569 test/com/sun/jndi/dns/IPv6NameserverPlatformParsingTest.java |
31 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
32 |
+++ jdk8/jdk/test/com/sun/jndi/dns/IPv6NameserverPlatformParsingTest.java Mon Apr 27 17:17:07 2015 +0100 |
+++ openjdk/jdk/test/com/sun/jndi/dns/IPv6NameserverPlatformParsingTest.java Mon Apr 27 17:17:07 2015 +0100 |
33 |
@@ -0,0 +1,104 @@ |
@@ -0,0 +1,104 @@ |
34 |
+/* |
+/* |
35 |
+ * Copyright (c) 2015, Red Hat, Inc. |
+ * Copyright (c) 2015, Red Hat, Inc. |
135 |
+ } |
+ } |
136 |
+ |
+ |
137 |
+} |
+} |
|
|
|