Merge branch 'bug/error-when-job-list-empty' of https://github.com/vi…

…nce94320/crystal-redis into vince94320-bug/error-when-job-list-empty
stefanwille · Jan 4, 2020 · 6de38fb · 6de38fb
2 parents f6c13b9 + acfa599
commit 6de38fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/spec/redis_spec.cr b/spec/redis_spec.cr
@@ -592,6 +592,9 @@ describe Redis do
       redis.del("myotherlist")
       redis.rpush("mylist", "hello", "world")
       redis.brpop(["myotherlist", "mylist"], 1).should eq(["mylist", "world"])
+
+      redis.del("mylist")
+      redis.brpop(["mylist"], 1).should eq([] of String)
     end
 
     it "#rpoplpush" do

diff --git a/src/redis/commands.cr b/src/redis/commands.cr
@@ -941,7 +941,7 @@ class Redis
       q << timeout_in_seconds.to_s
       result = array_or_nil_command(q)
 
-      return result unless result
+      return result if result.nil? || result.empty?
 
       result[0] = without_namespace("#{result.first}")
       result