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.39 by dl, Sun Dec 1 20:55:54 2013 UTC vs.
Revision 1.40 by jsr166, Sat Dec 21 21:32:34 2013 UTC

# Line 1923 | Line 1923 | public class ConcurrentHashMap<K,V> impl
1923          final TreeNode<K,V> findTreeNode(int h, Object k, Class<?> kc) {
1924              if (k != null) {
1925                  TreeNode<K,V> p = this;
1926 <                do  {
1926 >                do {
1927                      int ph, dir; K pk; TreeNode<K,V> q;
1928                      TreeNode<K,V> pl = p.left, pr = p.right;
1929                      if ((ph = p.hash) > h)
# Line 2378 | Line 2378 | public class ConcurrentHashMap<K,V> impl
2378  
2379          static <K,V> TreeNode<K,V> balanceDeletion(TreeNode<K,V> root,
2380                                                     TreeNode<K,V> x) {
2381 <            for (TreeNode<K,V> xp, xpl, xpr;;)  {
2381 >            for (TreeNode<K,V> xp, xpl, xpr;;) {
2382                  if (x == null || x == root)
2383                      return root;
2384                  else if ((xp = x.parent) == null) {

Diff Legend

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