OpenJDK / lambda / lambda / jdk
changeset 7692:5186c91db849
Merge
| author | briangoetz |
|---|---|
| date | Tue, 19 Mar 2013 16:09:19 -0400 |
| parents | 90979767b8b6 8ab50e397954 |
| children | 4368bcd98e71 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/util/Spliterators.java Tue Mar 19 16:08:56 2013 -0400 +++ b/src/share/classes/java/util/Spliterators.java Tue Mar 19 16:09:19 2013 -0400 @@ -918,10 +918,10 @@ /** * Creates a new spliterator using the given given - * collection's {@link java.util.Collection#iterator()) for traversal, and - * reporting its {@link java.util.Collection#size()) as its initial size. + * collection's {@link java.util.Collection#iterator()} for traversal, and + * reporting its {@link java.util.Collection#size()} as its initial size. * - * @param c the collection + * @param collection the collection * @param characteristics properties of this spliterator's * source or elements. */
--- a/src/share/classes/java/util/concurrent/ConcurrentSkipListSet.java Tue Mar 19 16:08:56 2013 -0400 +++ b/src/share/classes/java/util/concurrent/ConcurrentSkipListSet.java Tue Mar 19 16:09:19 2013 -0400 @@ -60,8 +60,8 @@ * Iterators are <i>weakly consistent</i>, returning elements * reflecting the state of the set at some point at or since the * creation of the iterator. They do <em>not</em> throw {@link - * ConcurrentModificationException}, and may proceed concurrently with - * other operations. Ascending ordered views and their iterators are + * java.util.ConcurrentModificationException}, and may proceed concurrently + * with other operations. Ascending ordered views and their iterators are * faster than descending ones. * * <p>Beware that, unlike in most collections, the {@code size}