From 589628823f6285fe734c3708ab061104bc5b5efe Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Thu, 18 Jul 2019 21:52:19 -0400
Subject: [PATCH] Fix merge conflict

Former-commit-id: 0b43b51a2e3a6af11532146fbb7929f3ecf3b036
---
 src/db.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/db.cpp b/src/db.cpp
index a3dec518a..f6607b40e 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -1274,7 +1274,7 @@ void setExpire(client *c, redisDb *db, robj *key, expireEntry &&e)
     kde = dictFind(db->pdict,ptrFromObj(key));
     serverAssertWithInfo(NULL,key,kde != NULL);
 
-    if (((robj*)dictGetVal(kde))->refcount == OBJ_SHARED_REFCOUNT)
+    if (((robj*)dictGetVal(kde))->getrefcount(std::memory_order_relaxed) == OBJ_SHARED_REFCOUNT)
     {
         // shared objects cannot have the expire bit set, create a real object
         dictSetVal(db->pdict, kde, dupStringObject((robj*)dictGetVal(kde)));