From fc8b2309b8beab978765cfe0e170ffc3cb18d2fb Mon Sep 17 00:00:00 2001
From: Doug Lea <dl@openjdk.org>
Date: Thu, 15 Aug 2013 15:04:59 +0100
Subject: [PATCH] 8023104: ConcurrentHashMap typo

Reviewed-by: chegar, mduigou
---
 .../share/classes/java/util/concurrent/ConcurrentHashMap.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java b/jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java
index 2914d1a8598..f29ec1d4efb 100644
--- a/jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java
+++ b/jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java
@@ -2785,7 +2785,7 @@ public class ConcurrentHashMap<K,V> extends AbstractMap<K,V>
                         return;
                     }
                 }
-                else if ((s | WAITER) == 0) {
+                else if ((s & WAITER) == 0) {
                     if (U.compareAndSwapInt(this, LOCKSTATE, s, s | WAITER)) {
                         waiting = true;
                         waiter = Thread.currentThread();