Fixed stop query incorrectly waiting for response

Author: dancannon

CHANGELOG.md

@@ -16,6 +16,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
  - Fixed `Decode` no longer setting pointer to nil on document not found
  - Fixed panic when `fetchMore` returns an error
  - Fixed deadlock when closing changefeed
+ - Fixed stop query incorrectly waiting for response
 
 ## v1.1.3
 ### Fixed

cursor.go

@@ -119,11 +119,12 @@ func (c *Cursor) Close() error {
 		q := Query{
 			Type:  p.Query_STOP,
 			Token: c.token,
+			Opts: map[string]interface{}{
+				"noreply": true,
+			},
 		}
 
-		c.mu.Unlock()
 		_, _, err = conn.Query(q)
-		c.mu.Lock()
 	}
 
 	if c.releaseConn != nil {

query_table_test.go

@@ -264,9 +264,41 @@ func (s *RethinkSuite) TestTableChangesExit(c *test.C) {
 	for _ = range change {
 		n++
 	}
-	if res.Err() != nil {
-		c.Fatal(res.Err())
+	if res.Err() == nil {
+		c.Fatal("No error returned, expected connection closed")
 	}
 
 	c.Assert(n, test.Equals, 5)
 }
+
+func (s *RethinkSuite) TestTableChangesExitNoResults(c *test.C) {
+	DB("test").TableDrop("changes").Exec(session)
+	DB("test").TableCreate("changes").Exec(session)
+
+	var n int
+
+	res, err := DB("test").Table("changes").Changes().Run(session)
+	if err != nil {
+		c.Fatal(err.Error())
+	}
+	c.Assert(res.Type(), test.Equals, "Feed")
+
+	change := make(chan ChangeResponse)
+
+	// Close cursor after one second
+	go func() {
+		<-time.After(time.Second)
+		res.Close()
+	}()
+
+	// Listen for changes
+	res.Listen(change)
+	for _ = range change {
+		n++
+	}
+	if res.Err() == nil {
+		c.Fatal("No error returned, expected connection closed")
+	}
+
+	c.Assert(n, test.Equals, 0)
+}