hg: jdk7/tl/jdk: 2 new changesets

[chris.hegarty at oracle.com]

Changeset: 2a8d1a0a2418
Author:    chegar
Date:      2011-01-21 17:02 +0000
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/2a8d1a0a2418

7012768: InetAddress lookupTable leaks/deadlocks when using unsupported name service spi
Reviewed-by: alanb, michaelm

! src/share/classes/java/net/InetAddress.java
- test/java/net/InetAddress/B4762344.java
- test/java/net/InetAddress/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/java/net/InetAddress/Simple1NameServiceDescriptor.java
- test/java/net/InetAddress/Simple2NameServiceDescriptor.java
- test/java/net/InetAddress/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/B6442088.java
- test/sun/net/InetAddress/nameservice/CacheTest.java
- test/sun/net/InetAddress/nameservice/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/sun/net/InetAddress/nameservice/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/SimpleNameServiceDescriptor.java
+ test/sun/net/InetAddress/nameservice/chaining/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
+ test/sun/net/InetAddress/nameservice/chaining/Providers.java
+ test/sun/net/InetAddress/nameservice/chaining/Simple1NameServiceDescriptor.java
+ test/sun/net/InetAddress/nameservice/chaining/Simple2NameServiceDescriptor.java
+ test/sun/net/InetAddress/nameservice/chaining/SimpleNameService.java
+ test/sun/net/InetAddress/nameservice/deadlock/Hang.java
+ test/sun/net/InetAddress/nameservice/deadlock/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
+ test/sun/net/InetAddress/nameservice/deadlock/ThrowingNameService.java
+ test/sun/net/InetAddress/nameservice/deadlock/ThrowingNameServiceDescriptor.java
+ test/sun/net/InetAddress/nameservice/simple/CacheTest.java
+ test/sun/net/InetAddress/nameservice/simple/DefaultCaching.java
+ test/sun/net/InetAddress/nameservice/simple/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
+ test/sun/net/InetAddress/nameservice/simple/SimpleNameService.java
+ test/sun/net/InetAddress/nameservice/simple/SimpleNameServiceDescriptor.java

Changeset: 6a7b8406a1b9
Author:    chegar
Date:      2011-01-21 17:04 +0000
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/6a7b8406a1b9

Merge