Mercurial > hg > release > icedtea8-forest-3.0 > jdk
changeset 11712:332d7dd4c094
Merge
author | asaha |
---|---|
date | Mon, 07 Dec 2015 23:02:58 -0800 |
parents | e373d5fbe557 (current diff) 75c994c14748 (diff) |
children | 18d7639101ca |
files | .hgtags |
diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Dec 03 13:39:57 2015 -0800 +++ b/.hgtags Mon Dec 07 23:02:58 2015 -0800 @@ -513,6 +513,7 @@ eac13ca04cc5c9adb4f14a76856376db0187f7dc jdk8u71-b09 e494e93d48f943229223d881a2928064a69cdf23 jdk8u71-b10 32226f73879f21f7a7bb024f4197c089b53a93c4 jdk8u71-b11 +8181f8b6ef0d861f57547c89e52f258cb5583b77 jdk8u71-b12 be5faa9c77042f202106c18f4e8ea211137b4a3b jdk8u72-b00 5ad1e9e8e8417f80c91d7e0f1f44cdf89b34ead3 jdk8u72-b01 ab0c1040414d038ccbcfcc8ceb1ccf2f44ead8e4 jdk8u72-b02 @@ -525,4 +526,5 @@ ff73e114d682ec14c11099c6c5d48b75bf685394 jdk8u72-b09 dcf7fd07b08b59e1802851d016d913c254221a44 jdk8u72-b10 d7cc3225f1050de03b236b92e12c547f21697013 jdk8u72-b11 +8afb58c7312b45fe5237afb0292176b734934f60 jdk8u72-b12 7cfd2c51c501df909833aa0fb6e40c50c61621ed jdk8u75-b00
--- a/test/java/nio/channels/ServerSocketChannel/AdaptServerSocket.java Thu Dec 03 13:39:57 2015 -0800 +++ b/test/java/nio/channels/ServerSocketChannel/AdaptServerSocket.java Mon Dec 07 23:02:58 2015 -0800 @@ -122,7 +122,7 @@ public static void main(String[] args) throws Exception { test(0, 0, false); - test(50, 500, false); + test(50, 5000, false); test(500, 50, true); }