Merge pull request hoisie#19 from eaigner/master

Fixed hoisie#18
qm1004 · Jun 26, 2013 · 96b5da6 · 96b5da6
2 parents c044ea7 + 01d27cc
commit 96b5da6
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/redis.go b/redis.go
@@ -218,6 +218,7 @@ func (client *Client) sendCommands(cmdArgs <-chan []string, data chan<- interfac
     var reader *bufio.Reader
     var pong interface{}
     var errs chan error
+    var errsClosed = false
 
     if err != nil {
         goto End
@@ -253,23 +254,33 @@ func (client *Client) sendCommands(cmdArgs <-chan []string, data chan<- interfac
         for cmdArg := range cmdArgs {
             err = writeRequest(c, cmdArg[0], cmdArg[1:]...)
             if err != nil {
-                errs <- err
+                if !errsClosed {
+                    errs <- err
+                }
                 break
             }
         }
-        close(errs)
+        if !errsClosed {
+            errsClosed = true
+            close(errs)
+        }
     }()
 
     go func() {
         for {
             response, err := readResponse(reader)
             if err != nil {
-                errs <- err
+                if !errsClosed {
+                    errs <- err
+                }
                 break
             }
             data <- response
         }
-        close(errs)
+        if !errsClosed {
+            errsClosed = true
+            close(errs)
+        }
     }()
 
     // Block until errs channel closes