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.88 by dl, Tue Jan 22 18:25:32 2013 UTC vs.
Revision 1.89 by jsr166, Tue Jan 22 20:08:33 2013 UTC

# Line 927 | Line 927 | public class ConcurrentSkipListMap<K,V>
927       * Adds given index nodes from given level down to 1.
928       * @param idx the topmost index node being inserted
929       * @param h the value of head to use to insert. This must be
930 <     * snapshotted by callers to provide correct insertion level
930 >     * snapshotted by callers to provide correct insertion level.
931       * @param indexLevel the level of the index
932       */
933      @SuppressWarnings("unchecked")
# Line 948 | Line 948 | public class ConcurrentSkipListMap<K,V>
948                  if (r != null) {
949                      Node<K,V> n = r.node;
950                      // compare before deletion check avoids needing recheck
951 <                    int c = (cmp == null?
952 <                             ((Comparable<? super K>)key).compareTo(n.key) :
953 <                             cmp.compare(key, n.key));
951 >                    int c = (cmp == null) ?
952 >                        ((Comparable<? super K>)key).compareTo(n.key) :
953 >                        cmp.compare(key, n.key);
954                      if (n.value == null) {
955                          if (!q.unlink(r))
956                              break;
# Line 2174 | Line 2174 | public class ConcurrentSkipListMap<K,V>
2174              throw new NullPointerException();
2175          Comparator<? super K> cmp = comparator;
2176          for (;;) {
2177 <            Node<K,V> n = (cmp == null)? findNode((Comparable<? super K>)key) :
2177 >            Node<K,V> n = (cmp == null) ?
2178 >                findNode((Comparable<? super K>)key) :
2179                  findNodeCmp(cmp, key);
2180              if (n == null)
2181                  return false;
# Line 2202 | Line 2203 | public class ConcurrentSkipListMap<K,V>
2203              throw new NullPointerException();
2204          Comparator<? super K> cmp = comparator;
2205          for (;;) {
2206 <            Node<K,V> n = (cmp == null)? findNode((Comparable<? super K>)key) :
2206 >            Node<K,V> n = (cmp == null) ?
2207 >                findNode((Comparable<? super K>)key) :
2208                  findNodeCmp(cmp, key);
2209              if (n == null)
2210                  return null;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines