Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8023104: ConcurrentHashMap typo
authordl
Thu, 15 Aug 2013 15:04:59 +0100
changeset 19413 56082c988815
parent 19412 e7847bc5763b
child 19414 931c01c5c3aa
8023104: ConcurrentHashMap typo Reviewed-by: chegar, mduigou
jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java file | annotate | diff | comparison | revisions 
--- a/jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java	Thu Aug 15 15:01:37 2013 +0100
+++ b/jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java	Thu Aug 15 15:04:59 2013 +0100
@@ -2785,7 +2785,7 @@
                         return;
                     }
                 }
-                else if ((s | WAITER) == 0) {
+                else if ((s & WAITER) == 0) {
                     if (U.compareAndSwapInt(this, LOCKSTATE, s, s | WAITER)) {
                         waiting = true;
                         waiter = Thread.currentThread();
jdk-sandbox