---

jeanbza · web-flow · commit 20d2bf96cf2c · 2018-04-09T10:58:47.000-07:00
yaml --- r: 9211 b: refs/heads/master c: c96f1f3 h: refs/heads/master i: 9209: 3c6ddb2 9207: 4433082
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3dc830ea7d536c808eed3cdea8ea77c59f725719
+refs/heads/master: c96f1f3c92150fc037f1249841d9c0601612d701
 refs/heads/travis: 47e4fee4fd5af9b2a8ce46f23c72ec95f9b195b2
 refs/heads/gh-pages: c44712253909b883eff39836632d6fa5763aa5af
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
diff --git a/trunk/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java b/trunk/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java
@@ -32,9 +32,9 @@
 import com.google.cloud.pubsub.v1.AckReplyConsumer;
 import com.google.cloud.pubsub.v1.MessageReceiver;
 import com.google.cloud.pubsub.v1.Subscriber;
-import com.google.cloud.pubsub.v1.stub.SubscriberStubSettings;
 import com.google.cloud.pubsub.v1.stub.GrpcSubscriberStub;
 import com.google.cloud.pubsub.v1.stub.SubscriberStub;
+import com.google.cloud.pubsub.v1.stub.SubscriberStubSettings;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.pubsub.v1.AcknowledgeRequest;
 import com.google.pubsub.v1.ProjectSubscriptionName;
@@ -45,7 +45,8 @@
 import java.io.FileInputStream;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /** This class contains snippets for the {@link Subscriber} interface. */
 public class SubscriberSnippets {
@@ -56,29 +57,26 @@ public class SubscriberSnippets {
 
   private final ApiFuture<Void> done;
 
-  private final Executor executor;
-
   public SubscriberSnippets(
       ProjectSubscriptionName subscriptionName,
       MessageReceiver receiver,
-      ApiFuture<Void> done,
-      Executor executor) {
+      ApiFuture<Void> done) {
     this.subscriptionName = subscriptionName;
     this.receiver = receiver;
     this.done = done;
-    this.executor = executor;
   }
 
   // [TARGET startAsync()]
   public void startAndWait() throws Exception {
     Subscriber subscriber = Subscriber.newBuilder(subscriptionName, receiver).build();
+    ExecutorService pool = Executors.newCachedThreadPool();
     subscriber.addListener(
         new Subscriber.Listener() {
           public void failed(Subscriber.State from, Throwable failure) {
             // Handle error.
           }
         },
-        executor);
+        pool);
     subscriber.startAsync();
 
     // Wait for a stop signal.
@@ -97,6 +95,7 @@ public void failed(Subscriber.State from, Throwable failure) {
     //   }
     // at the end of main() to previent the main thread from exiting.
     done.get();
+    pool.shutdown();
     subscriber.stopAsync().awaitTerminated();
   }
 
diff --git a/trunk/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITPubSubSnippets.java b/trunk/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITPubSubSnippets.java
@@ -108,8 +108,7 @@ public void onFailure(Throwable t) {
         new SubscriberSnippets(
             subscriptionName,
             new MessageReceiverSnippets(queue).messageReceiver(),
-            done,
-            MoreExecutors.directExecutor());
+            done);
     new Thread(
             new Runnable() {
               @Override
