merge conflicts resolved

[redis.git] / src / cluster.c

diff --git a/src/cluster.c b/src/cluster.c
index 1c0b1c23e54a3b7b7401fb9a9f99fc48d4aaf8a4..c6fc44b1a9f4ce52c7ea250c6c7cf0415ed97faa 100644 (file)
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -1389,7 +1389,7 @@ void restoreCommand(redisClient *c) {
     robj *obj;
 
     /* Make sure this key does not already exist here... */
-    if (dbExists(c->db,c->argv[1])) {
+    if (lookupKeyWrite(c->db,c->argv[1]) != NULL) {
         addReplyError(c,"Target key name is busy.");
         return;
     }