---

Ajay Kannan · Ajay Kannan · commit 923a6f149e3e · 2015-12-01T15:54:32.000-08:00
yaml --- r: 2535 b: refs/heads/update-datastore c: 18cbb77 h: refs/heads/master i: 2533: a7021fa 2531: 5fe7bab 2527: d38ebf9
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
 refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
 refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
-refs/heads/update-datastore: af94b5312daa978b693ce38b5f2314a335f3d531
+refs/heads/update-datastore: 18cbb774258a77172a988d7a84c5e559d57b0c95
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
 refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
 refs/tags/v0.0.11: ffbfba48a6426ff63c08ff2117e58681f251fbf2
diff --git a/branches/update-datastore/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/branches/update-datastore/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();
