From 9e15a9ddfb500d5539f12afcafa5a3dfa01aa68e Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Sat, 26 Jan 2013 11:27:46 -0800
Subject: [PATCH] Handle edge case where namespace is set in options, not hash

---
 lib/sidekiq.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sidekiq.rb b/lib/sidekiq.rb
index 0411dbe2..771be8f0 100644
--- a/lib/sidekiq.rb
+++ b/lib/sidekiq.rb
@@ -69,7 +69,7 @@ module Sidekiq
   def self.redis=(hash)
     if hash.is_a?(Hash)
       @redis = RedisConnection.create(hash)
-      options[:namespace] = hash[:namespace]
+      options[:namespace] ||= hash[:namespace]
     elsif hash.is_a?(ConnectionPool)
       @redis = hash
     else