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

Comparing jsr166/src/main/java/util/concurrent/ConcurrentHashMap.java (file contents):
Revision 1.206 by dl, Thu Apr 11 23:17:43 2013 UTC vs.
Revision 1.207 by jsr166, Tue Apr 16 05:45:59 2013 UTC

# Line 628 | Line 628 | public class ConcurrentHashMap<K,V>
628          if ((cmpc = Comparable.class).isAssignableFrom(c)) {
629              while (cmpc.isAssignableFrom(s = c.getSuperclass()))
630                  c = s; // find topmost comparable class
631 <            if ((ts  = c.getGenericInterfaces()) != null) {
631 >            if ((ts = c.getGenericInterfaces()) != null) {
632                  for (int i = 0; i < ts.length; ++i) {
633                      if (((t = ts[i]) instanceof ParameterizedType) &&
634                          ((p = (ParameterizedType)t).getRawType() == cmpc) &&
# Line 765 | Line 765 | public class ConcurrentHashMap<K,V>
765          @SuppressWarnings("unchecked") final TreeNode<V> getTreeNode
766              (int h, Object k, TreeNode<V> p, Class<?> cc) {
767              while (p != null) {
768 <                int dir, ph;  Object pk;
768 >                int dir, ph; Object pk;
769                  if ((ph = p.hash) != h)
770                      dir = (h < ph) ? -1 : 1;
771                  else if ((pk = p.key) == k || k.equals(pk))
# Line 2483 | Line 2483 | public class ConcurrentHashMap<K,V>
2483           * anyway.
2484           */
2485          final int preSplit() {
2486 <            int b;  ForkJoinPool pool;
2486 >            int b; ForkJoinPool pool;
2487              if ((b = batch) < 0) { // force initialization
2488                  int sp = (((pool = getPool()) == null) ?
2489                            ForkJoinPool.getCommonPoolParallelism() :

Diff Legend

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