From 69ac43ca0ef6a0645d9128d2171b496288d28538 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Thu, 16 Jun 2016 13:38:03 +0300
Subject: [PATCH] required sync added

---
 .../org/redisson/connection/MasterSlaveEntry.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/redisson/connection/MasterSlaveEntry.java b/src/main/java/org/redisson/connection/MasterSlaveEntry.java
index 0fe9871a0..1e3cdefff 100644
--- a/src/main/java/org/redisson/connection/MasterSlaveEntry.java
+++ b/src/main/java/org/redisson/connection/MasterSlaveEntry.java
@@ -291,8 +291,10 @@ public class MasterSlaveEntry {
                 this.config.getSlaveSubscriptionConnectionMinimumIdleSize(),
                 this.config.getSlaveSubscriptionConnectionPoolSize(), connectionManager, mode);
         if (freezed) {
-            entry.setFreezed(freezed);
-            entry.setFreezeReason(FreezeReason.SYSTEM);
+            synchronized (entry) {
+                entry.setFreezed(freezed);
+                entry.setFreezeReason(FreezeReason.SYSTEM);
+            }
         }
         return slaveBalancer.add(entry);
     }
@@ -350,8 +352,10 @@ public class MasterSlaveEntry {
 
     public void unfreeze() {
         masterEntry.resetFailedAttempts();
-        masterEntry.setFreezed(false);
-        masterEntry.setFreezeReason(null);
+        synchronized (masterEntry) {
+            masterEntry.setFreezed(false);
+            masterEntry.setFreezeReason(null);
+        }
     }
 
     public void shutdownMasterAsync() {