---

pongad · web-flow · commit 0df4048352b3 · 2017-07-15T12:33:18.000+10:00
yaml --- r: 8167 b: refs/heads/tswast-patch-1 c: 793943c h: refs/heads/master i: 8165: 5e5008d 8163: 578f7a1 8159: badf622
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: 8e074f3c07dee4efc0c6f204b57b40fd5d531dcb
+refs/heads/tswast-patch-1: 793943cbb6c02bc7d8c79e114894ca0b23e417c2
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-core-http/src/main/java/com/google/cloud/http/HttpTransportOptions.java b/branches/tswast-patch-1/google-cloud-core-http/src/main/java/com/google/cloud/http/HttpTransportOptions.java
@@ -149,6 +149,7 @@ public HttpRequestInitializer getHttpRequestInitializer(
     final HttpRequestInitializer delegate =
         scopedCredentials != null && scopedCredentials != NoCredentials.getInstance()
             ? new HttpCredentialsAdapter(scopedCredentials) : null;
+    final String xGoogHeader = getXGoogApiClientHeader(serviceOptions.getLibraryVersion());
     return new HttpRequestInitializer() {
       @Override
       public void initialize(HttpRequest httpRequest) throws IOException {
@@ -163,8 +164,7 @@ public void initialize(HttpRequest httpRequest) throws IOException {
         }
 
         HttpHeaders headers = httpRequest.getHeaders();
-        headers.set(
-            "x-goog-api-client", getXGoogApiClientHeader(serviceOptions.getLibraryVersion()));
+        headers.set("x-goog-api-client", xGoogHeader);
       }
     };
   }

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ public HttpRequestInitializer getHttpRequestInitializer(`
`149`	`149`	`final HttpRequestInitializer delegate =`
`150`	`150`	`scopedCredentials != null && scopedCredentials != NoCredentials.getInstance()`
`151`	`151`	`? new HttpCredentialsAdapter(scopedCredentials) : null;`
	`152`	`+ final String xGoogHeader = getXGoogApiClientHeader(serviceOptions.getLibraryVersion());`
`152`	`153`	`return new HttpRequestInitializer() {`
`153`	`154`	`@Override`
`154`	`155`	`public void initialize(HttpRequest httpRequest) throws IOException {`
`@@ -163,8 +164,7 @@ public void initialize(HttpRequest httpRequest) throws IOException {`
`163`	`164`	`}`
`164`	`165`
`165`	`166`	`HttpHeaders headers = httpRequest.getHeaders();`
`166`		`- headers.set(`
`167`		`- "x-goog-api-client", getXGoogApiClientHeader(serviceOptions.getLibraryVersion()));`
	`167`	`+ headers.set("x-goog-api-client", xGoogHeader);`
`168`	`168`	`}`
`169`	`169`	`};`
`170`	`170`	`}`