Bläddra i källkod

Merge pull request #672 from woodsaj/fixDeadlock

close call.timeout to prevent deadlock.
Chris Bannister 9 år sedan
förälder
incheckning
1e7d626b62
2 ändrade filer med 2 tillägg och 0 borttagningar
  1. 1 0
      AUTHORS
  2. 1 0
      conn.go

+ 1 - 0
AUTHORS

@@ -64,3 +64,4 @@ Artem Chernyshev <artem.0xD2@gmail.com>
 Ference Fu <fym201@msn.com>
 Ference Fu <fym201@msn.com>
 LOVOO <opensource@lovoo.com>
 LOVOO <opensource@lovoo.com>
 nikandfor <nikandfor@gmail.com>
 nikandfor <nikandfor@gmail.com>
+Anthony Woods <awoods@raintank.io>

+ 1 - 0
conn.go

@@ -570,6 +570,7 @@ func (c *Conn) exec(req frameWriter, tracer Tracer) (*framer, error) {
 
 
 	select {
 	select {
 	case err := <-call.resp:
 	case err := <-call.resp:
+		close(call.timeout)
 		if err != nil {
 		if err != nil {
 			if !c.Closed() {
 			if !c.Closed() {
 				// if the connection is closed then we cant release the stream,
 				// if the connection is closed then we cant release the stream,