changeset 19413:56082c988815

8023104: ConcurrentHashMap typo Reviewed-by: chegar, mduigou
author dl
date Thu, 15 Aug 2013 15:04:59 +0100
parents e7847bc5763b
children 931c01c5c3aa
files jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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();