---

pongad · web-flow · commit fa31e64f9a37 · 2017-04-07T15:29:51.000+10:00
yaml --- r: 7963 b: refs/heads/tswast-patch-1 c: c2fb49e h: refs/heads/master i: 7961: ce89135 7959: 4085e61
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: c531a0a0f1e59b10044c7941fdf77165e701d88a
+refs/heads/tswast-patch-1: c2fb49ea1efafd8be4605aaae03bde7bfd57d0e3
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java b/branches/tswast-patch-1/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java
@@ -214,9 +214,7 @@ public UnaryCallSettings.Builder getApiCallSettings(RetrySettings retrySettings)
    */
   public static ChannelProvider setUpChannelProvider(
       InstantiatingChannelProvider.Builder providerBuilder, ServiceOptions<?, ?> serviceOptions) {
-    HostAndPort hostAndPort = HostAndPort.fromString(serviceOptions.getHost());
-    providerBuilder.setServiceAddress(hostAndPort.getHostText())
-        .setPort(hostAndPort.getPort())
+    providerBuilder.setEndpoint(serviceOptions.getHost())
         .setClientLibHeader(ServiceOptions.getGoogApiClientLibName(),
             firstNonNull(ServiceOptions.getLibraryVersion(), ""));
     Credentials scopedCredentials = serviceOptions.getScopedCredentials();
