---

mziccard · web-flow · commit 3b35ba7086ed · 2016-10-19T13:03:19.000+02:00
yaml --- r: 7627 b: refs/heads/tswast-patch-1 c: 8c9aca4 h: refs/heads/master i: 7625: 572b219 7623: 936a2f3
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: 513ca7034aca5395ab4e1b7a36899ffa56566af8
+refs/heads/tswast-patch-1: 8c9aca409f98f910569adba836be3f83e6dd0430
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PubSubOptions.java b/branches/tswast-patch-1/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PubSubOptions.java
@@ -32,6 +32,7 @@ public class PubSubOptions extends GrpcServiceOptions<PubSub, PubSubRpc, PubSubO
   private static final long serialVersionUID = 5640180400046623305L;
   private static final String PUBSUB_SCOPE = "https://www.googleapis.com/auth/pubsub";
   private static final Set<String> SCOPES = ImmutableSet.of(PUBSUB_SCOPE);
+  private static final String EMULATOR_HOST_ENV_VAR = "PUBSUB_EMULATOR_HOST";
   private static final String DEFAULT_HOST = PublisherSettings.getDefaultServiceAddress()
       + ':' + PublisherSettings.getDefaultServicePort();
 
@@ -66,7 +67,8 @@ public PubSubRpc create(PubSubOptions options) {
 
   @Override
   protected String defaultHost() {
-    return DEFAULT_HOST;
+    String host = System.getProperty(EMULATOR_HOST_ENV_VAR, System.getenv(EMULATOR_HOST_ENV_VAR));
+    return host != null ? host : DEFAULT_HOST;
   }
 
   public static class Builder extends
