---

Ajay Kannan · Ajay Kannan · commit 0c50a2a5df72 · 2015-12-01T15:54:32.000-08:00
yaml --- r: 1405 b: refs/heads/master c: 18cbb77 h: refs/heads/master i: 1403: 8edb458
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: af94b5312daa978b693ce38b5f2314a335f3d531
+refs/heads/master: 18cbb774258a77172a988d7a84c5e559d57b0c95
 refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
 refs/heads/gh-pages: d1b373c30c176edc08692348167bec3a244bb823
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
diff --git a/trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -31,7 +31,6 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.api.services.storage.model.StorageObject;
-import com.google.auth.oauth2.GoogleCredentials;
 import com.google.auth.oauth2.ServiceAccountCredentials;
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
@@ -43,7 +42,6 @@
 import com.google.common.hash.Hashing;
 import com.google.common.io.BaseEncoding;
 import com.google.common.primitives.Ints;
-import com.google.gcloud.AuthCredentials;
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
 import com.google.gcloud.BaseService;
 import com.google.gcloud.ExceptionHandler;
@@ -562,18 +560,16 @@ public URL signUrl(BlobInfo blobInfo, long duration, TimeUnit unit, SignUrlOptio
     for (SignUrlOption option : options) {
       optionMap.put(option.option(), option.value());
     }
-    ServiceAccountAuthCredentials serviceAccountAuthCred =
+    ServiceAccountAuthCredentials authCred =
         (ServiceAccountAuthCredentials) optionMap.get(SignUrlOption.Option.SERVICE_ACCOUNT_CRED);
-    ServiceAccountCredentials cred = (ServiceAccountCredentials) (serviceAccountAuthCred != null
-        ? serviceAccountAuthCred.credentials() : null);
-    if (serviceAccountAuthCred == null) {
-      AuthCredentials authCred = this.options().authCredentials();
-      GoogleCredentials serviceCred =
-          authCred != null ? authCred.credentials() : null;
+    ServiceAccountCredentials cred =
+        (ServiceAccountCredentials) (authCred != null ? authCred.credentials() : null);
+    if (authCred == null) {
       checkArgument(
-          serviceCred instanceof ServiceAccountCredentials,
+          this.options().authCredentials() != null
+          && this.options().authCredentials().credentials() instanceof ServiceAccountCredentials,
           "Signing key was not provided and could not be derived");
-      cred = (ServiceAccountCredentials) serviceCred;
+      cred = (ServiceAccountCredentials) this.options().authCredentials().credentials();
     }
     // construct signature - see https://cloud.google.com/storage/docs/access-control#Signed-URLs
     StringBuilder stBuilder = new StringBuilder();
