From a4e21aff5ff88390962b83272d3ec0acca76a380 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Sat, 14 Mar 2015 13:55:48 +0300
Subject: [PATCH] RMap.replace race-condition fixed

---
 src/main/java/org/redisson/RedissonMap.java               | 2 +-
 src/test/java/org/redisson/RedissonConcurrentMapTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/redisson/RedissonMap.java b/src/main/java/org/redisson/RedissonMap.java
index c127a7842..91e8c2ee4 100644
--- a/src/main/java/org/redisson/RedissonMap.java
+++ b/src/main/java/org/redisson/RedissonMap.java
@@ -285,8 +285,8 @@ public class RedissonMap<K, V> extends RedissonExpirable implements RMap<K, V> {
                         }
                     } else {
                         connection.unwatch();
+                        return null;
                     }
-                    return null;
                 }
             }
         });
diff --git a/src/test/java/org/redisson/RedissonConcurrentMapTest.java b/src/test/java/org/redisson/RedissonConcurrentMapTest.java
index cd2c33388..be96a8163 100644
--- a/src/test/java/org/redisson/RedissonConcurrentMapTest.java
+++ b/src/test/java/org/redisson/RedissonConcurrentMapTest.java
@@ -84,7 +84,7 @@ public class RedissonConcurrentMapTest extends BaseConcurrentTest {
             @Override
             public void run(Redisson redisson) {
                 ConcurrentMap<Integer, Integer> map = redisson.getMap(name);
-                map.replace(secureRandom.nextInt(5), 2);
+                Assert.assertNotNull(map.replace(secureRandom.nextInt(5), 2));
             }
         });