lib/redis/connection/synchrony.rb in redis-2.2.2 vs lib/redis/connection/synchrony.rb in redis-3.0.0.rc1

@@ -1,7 +1,8 @@
 require "redis/connection/command_helper"
 require "redis/connection/registry"
+require "redis/errors"
 require "em-synchrony"
 require "hiredis/reader"
 
 class Redis
   module Connection
@@ -26,13 +27,14 @@
       def receive_data(data)
         @reader.feed(data)
 
         begin
           until (reply = @reader.gets) == false
+            reply = CommandError.new(reply.message) if reply.is_a?(RuntimeError)
             @req.succeed [:reply, reply]
           end
         rescue RuntimeError => err
-          @req.fail [:error, ::Redis::ProtocolError.new(err.message)]
+          @req.fail [:error, ProtocolError.new(err.message)]
         end
       end
 
       def read
         @req = EventMachine::DefaultDeferrable.new