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

Comparing jsr166/src/jdk7/java/util/concurrent/ConcurrentHashMap.java (file contents):
Revision 1.18 by jsr166, Fri Feb 15 22:20:46 2013 UTC vs.
Revision 1.19 by jsr166, Tue Apr 16 05:45:59 2013 UTC

# Line 816 | Line 816 | public class ConcurrentHashMap<K,V>
816              (int h, Object k, TreeNode<V> p) {
817              Class<?> c = k.getClass();
818              while (p != null) {
819 <                int dir, ph;  Object pk; Class<?> pc;
819 >                int dir, ph; Object pk; Class<?> pc;
820                  if ((ph = p.hash) == h) {
821                      if ((pk = p.key) == k || k.equals(pk))
822                          return p;
# Line 880 | Line 880 | public class ConcurrentHashMap<K,V>
880              TreeNode<V> pp = root, p = null;
881              int dir = 0;
882              while (pp != null) { // find existing node or leaf to insert at
883 <                int ph;  Object pk; Class<?> pc;
883 >                int ph; Object pk; Class<?> pc;
884                  p = pp;
885                  if ((ph = p.hash) == h) {
886                      if ((pk = p.key) == k || k.equals(pk))
# Line 2371 | Line 2371 | public class ConcurrentHashMap<K,V>
2371           * anyway.
2372           */
2373          final int preSplit() {
2374 <            ConcurrentHashMap<K,V> m; int b; Node<V>[] t;  ForkJoinPool pool;
2374 >            ConcurrentHashMap<K,V> m; int b; Node<V>[] t; ForkJoinPool pool;
2375              if ((b = batch) < 0 && (m = map) != null) { // force initialization
2376                  if ((t = tab) == null && (t = tab = m.table) != null)
2377                      baseLimit = baseSize = t.length;

Diff Legend

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