Check for closed connection on timeout in Request

nats.go

@@ -2068,6 +2068,9 @@ func (nc *Conn) Request(subj string, data []byte, timeout time.Duration) (*Msg,
 			return nil, ErrConnectionClosed
 		}
 	case <-t.C:
+		if nc.isClosed() {
+			return nil, ErrConnectionClosed
+		}
 		return nil, ErrTimeout
 	}
 

test/basic_test.go

@@ -589,12 +589,33 @@ func TestSimultaneousRequests(t *testing.T) {
 	wg.Wait()
 }
 
+func TestRequestClose(t *testing.T) {
+	s := RunDefaultServer()
+	defer s.Shutdown()
+
+	nc := NewDefaultConnection(t)
+	defer nc.Close()
+
+	wg := &sync.WaitGroup{}
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		time.Sleep(100 * time.Millisecond)
+		nc.Close()
+	}()
+	if _, err := nc.Request("foo", []byte("help"), 500*time.Millisecond); err != nats.ErrInvalidConnection && err != nats.ErrConnectionClosed {
+		t.Fatalf("Expected connection error: got %v", err)
+	}
+	wg.Wait()
+}
+
 func TestRequestCloseTimeout(t *testing.T) {
 	// Make sure we return a timeout when we close
 	// the connection even if response is queued.
 
 	s := RunDefaultServer()
 	defer s.Shutdown()
+
 	nc := NewDefaultConnection(t)
 	defer nc.Close()