ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/concurrent/ConcurrentSkipListMap.java
(Generate patch)

Comparing jsr166/src/main/java/util/concurrent/ConcurrentSkipListMap.java (file contents):
Revision 1.153 by jsr166, Sun Sep 20 16:20:21 2015 UTC vs.
Revision 1.154 by jsr166, Sun Sep 20 17:03:22 2015 UTC

# Line 328 | Line 328 | public class ConcurrentSkipListMap<K,V>
328      private static final long serialVersionUID = -8627078645895051609L;
329  
330      /**
331 <     * Special value used to identify base-level header
331 >     * Special value used to identify base-level header.
332       */
333      static final Object BASE_HEADER = new Object();
334  
# Line 369 | Line 369 | public class ConcurrentSkipListMap<K,V>
369      }
370  
371      /**
372 <     * compareAndSet head node
372 >     * compareAndSet head node.
373       */
374      private boolean casHead(HeadIndex<K,V> cmp, HeadIndex<K,V> val) {
375          return U.compareAndSwapObject(this, HEAD, cmp, val);
# Line 412 | Line 412 | public class ConcurrentSkipListMap<K,V>
412          }
413  
414          /**
415 <         * compareAndSet value field
415 >         * compareAndSet value field.
416           */
417          boolean casValue(Object cmp, Object val) {
418              return U.compareAndSwapObject(this, VALUE, cmp, val);
419          }
420  
421          /**
422 <         * compareAndSet next field
422 >         * compareAndSet next field.
423           */
424          boolean casNext(Node<K,V> cmp, Node<K,V> val) {
425              return U.compareAndSwapObject(this, NEXT, cmp, val);
# Line 545 | Line 545 | public class ConcurrentSkipListMap<K,V>
545          }
546  
547          /**
548 <         * compareAndSet right field
548 >         * compareAndSet right field.
549           */
550          final boolean casRight(Index<K,V> cmp, Index<K,V> val) {
551              return U.compareAndSwapObject(this, RIGHT, cmp, val);
# Line 2725 | Line 2725 | public class ConcurrentSkipListMap<K,V>
2725          }
2726  
2727          /**
2728 <         * Submap version of ConcurrentSkipListMap.getNearEntry
2728 >         * Submap version of ConcurrentSkipListMap.getNearEntry.
2729           */
2730          Map.Entry<K,V> getNearEntry(K key, int rel) {
2731              Comparator<? super K> cmp = m.comparator;
# Line 3221 | Line 3221 | public class ConcurrentSkipListMap<K,V>
3221      }
3222  
3223      /**
3224 <     * Helper method for EntrySet.removeIf
3224 >     * Helper method for EntrySet.removeIf.
3225       */
3226      boolean removeEntryIf(Predicate<? super Entry<K,V>> function) {
3227          if (function == null) throw new NullPointerException();
# Line 3239 | Line 3239 | public class ConcurrentSkipListMap<K,V>
3239      }
3240  
3241      /**
3242 <     * Helper method for Values.removeIf
3242 >     * Helper method for Values.removeIf.
3243       */
3244      boolean removeValueIf(Predicate<? super V> function) {
3245          if (function == null) throw new NullPointerException();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines