stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Sean Coffey 2011-03-03 17:00:04 +00:00
commit 325ed5afa7
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jdk/src/share/classes/java/net/URI.java
View File

@ -991,7 +991,7 @@ public final class URI
* authority and path are taken from the given URI. </p></li>
*
* <li><p> Otherwise the new URI's authority component is copied from
* this URI, and its path is computed as follows: </p></li>
* this URI, and its path is computed as follows: </p>
*
* <ol type=a>
*
@ -1005,7 +1005,7 @@ public final class URI
* path and then normalizing the result as if by invoking the {@link
* #normalize() normalize} method. </p></li>
*
* </ol>
* </ol></li>
*
* </ol>
*
@ -1511,7 +1511,7 @@ public final class URI
* fragments. </p></li>
*
* <li><p> Two hierarchical URIs with identical schemes are ordered
* according to the ordering of their authority components: </p></li>
* according to the ordering of their authority components: </p>
*
* <ul type=disc>
*
@ -1526,7 +1526,7 @@ public final class URI
* the URIs are ordered according to the ordering of their authority
* components. </p></li>
*
* </ul>
* </ul></li>
*
* <li><p> Finally, two hierarchical URIs with identical schemes and
* authority components are ordered according to the ordering of their

8
jdk/src/share/classes/java/net/package.html
View File

@ -31,18 +31,18 @@ Provides the classes for implementing networking applications.
<p> The java.net package can be roughly divided in two sections:</p>
<ul>
<li> <p><i>A Low Level API</i>, which deals with the following abstractions:</p></li>
<li> <p><i>A Low Level API</i>, which deals with the following abstractions:</p>
<ul>
<li><p><i>Addresses</i>, which are networking identifiers, like IP addresses.</p></li>
<li><p><i>Sockets</i>, which are basic bidirectional data communication mechanisms.</p></li>
<li><p><i>Interfaces</i>, which describe network interfaces. </p></li>
</ul>
<li> <p><i>A High Level API</i>, which deals with the following abstractions:</p></li>
</ul></li>
<li> <p><i>A High Level API</i>, which deals with the following abstractions:</p>
<ul>
<li><p><i>URIs</i>, which represent Universal Resource Identifiers.</p></li>
<li><p><i>URLs</i>, which represent Universal Resource Locators.</p></li>
<li><p><i>Connections</i>, which represents connections to the resource pointed to by <i>URLs</i>.</p></li>
</ul>
</ul></li>
</ul>
<h2>Addresses</h2>
<p>Addresses are used throughout the java.net APIs as either host identifiers, or socket endpoint identifiers.</p>

13
jdk/test/java/lang/Thread/StartOOMTest.java
View File

@ -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.*;