---

Ajay Kannan · Ajay Kannan · commit f25f32d14f5b · 2015-12-01T16:04:32.000-08:00
yaml --- r: 6581 b: refs/heads/tswast-patch-1 c: 942ceb4 h: refs/heads/master i: 6579: 34d509c
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: 18cbb774258a77172a988d7a84c5e559d57b0c95
+refs/heads/tswast-patch-1: 942ceb40e3281593afb8da78ced1a9e476284c9c
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java b/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
@@ -177,7 +177,7 @@ public boolean equals(Object obj) {
     }
 
     @Override
-    public GoogleCredentials credentials() {
+    public ServiceAccountCredentials credentials() {
       return new ServiceAccountCredentials(null, account, privateKey, null, null);
     }
 
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -562,8 +562,7 @@ public URL signUrl(BlobInfo blobInfo, long duration, TimeUnit unit, SignUrlOptio
     }
     ServiceAccountAuthCredentials authCred =
         (ServiceAccountAuthCredentials) optionMap.get(SignUrlOption.Option.SERVICE_ACCOUNT_CRED);
-    ServiceAccountCredentials cred =
-        (ServiceAccountCredentials) (authCred != null ? authCred.credentials() : null);
+    ServiceAccountCredentials cred = authCred != null ? authCred.credentials() : null;
     if (authCred == null) {
       checkArgument(
           this.options().authCredentials() != null

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ public boolean equals(Object obj) {`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`@Override`
`180`		`- public GoogleCredentials credentials() {`
	`180`	`+ public ServiceAccountCredentials credentials() {`
`181`	`181`	`return new ServiceAccountCredentials(null, account, privateKey, null, null);`
`182`	`182`	`}`
`183`	`183`