diff --git a/src/share/classes/java/net/URI.java b/src/share/classes/java/net/URI.java index 111269d8b93ac8d1ea60eccd35c8bdb601f8fbb5..3465e1ab8794ce64725975608b9f71537b230181 100644 --- a/src/share/classes/java/net/URI.java +++ b/src/share/classes/java/net/URI.java @@ -991,7 +991,7 @@ public final class URI * authority and path are taken from the given URI.
* *Otherwise the new URI's authority component is copied from - * this URI, and its path is computed as follows:
Two hierarchical URIs with identical schemes are ordered - * according to the ordering of their authority components:
Finally, two hierarchical URIs with identical schemes and * authority components are ordered according to the ordering of their diff --git a/src/share/classes/java/net/package.html b/src/share/classes/java/net/package.html index 7c7058d7b1c28da5421a1839dccf0c86e74b2d94..12dfe9803d0a6c7c700a2a6e576c7a720a668158 100644 --- a/src/share/classes/java/net/package.html +++ b/src/share/classes/java/net/package.html @@ -31,18 +31,18 @@ Provides the classes for implementing networking applications.
The java.net package can be roughly divided in two sections:
A Low Level API, which deals with the following abstractions:
A Low Level API, which deals with the following abstractions:
Addresses, which are networking identifiers, like IP addresses.
Sockets, which are basic bidirectional data communication mechanisms.
Interfaces, which describe network interfaces.
A High Level API, which deals with the following abstractions:
A High Level API, which deals with the following abstractions:
URIs, which represent Universal Resource Identifiers.
URLs, which represent Universal Resource Locators.
Connections, which represents connections to the resource pointed to by URLs.
Addresses are used throughout the java.net APIs as either host identifiers, or socket endpoint identifiers.
diff --git a/test/java/lang/Thread/StartOOMTest.java b/test/java/lang/Thread/StartOOMTest.java index fd6c070baef47d767fb1d39426d64861e652d44c..57edd723c31ae97d44430ea14fb263395d3eacd9 100644 --- a/test/java/lang/Thread/StartOOMTest.java +++ b/test/java/lang/Thread/StartOOMTest.java @@ -22,11 +22,14 @@ */ /* - * @test - * @bug 6379235 - * @ignore until 6721694 is fixed - * @run main/othervm -server -Xmx32m -Xms32m -Xss256m StartOOMTest - * @summary ThreadGroup accounting mistake possible with failure of Thread.start() + * This test is relatively useful for verifying 6379235, but + * is too resource intensive, especially on 64 bit systems, + * to be run automatically, see 6721694. + * + * When run it should be typically be run with the server vm + * and a relatively small java heap, and a large stack size + * ( to provoke the OOM quicker ). + * java -server -Xmx32m -Xms32m -Xss256m StartOOMTest */ import java.util.*;