---

davidtorres · davidtorres · commit 88790a842660 · 2016-12-20T16:36:48.000-05:00
yaml --- r: 7767 b: refs/heads/tswast-patch-1 c: 6b3c738 h: refs/heads/master i: 7765: 73955c3 7763: 5d5dcf6 7759: 696c33f
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 6ef9df77d52a80860476c8fd73d6702732790400
+refs/heads/tswast-patch-1: 6b3c738f2ac7087ad74b20ace6e32bb974443cf1
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/StreamingSubscriberConnection.java b/branches/tswast-patch-1/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/StreamingSubscriberConnection.java
@@ -101,8 +101,8 @@ protected void doStart() {
   @Override
   protected void doStop() {
     messagesProcessor.stop();
-    requestObserver.onError(Status.CANCELLED.asException());
     notifyStopped();
+    requestObserver.onError(Status.CANCELLED.asException());
   }
 
   private class StreamingPullResponseObserver

Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,8 @@ protected void doStart() {`
`101`	`101`	`@Override`
`102`	`102`	`protected void doStop() {`
`103`	`103`	`messagesProcessor.stop();`
`104`		`- requestObserver.onError(Status.CANCELLED.asException());`
`105`	`104`	`notifyStopped();`
	`105`	`+ requestObserver.onError(Status.CANCELLED.asException());`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`private class StreamingPullResponseObserver`