Skip to content

Commit f429a8c

Browse files
author
Ajay Kannan
committed
---
yaml --- r: 2003 b: refs/heads/pubsub-alpha c: 942ceb4 h: refs/heads/master i: 2001: f42bf84 1999: 717c839
1 parent f45db6b commit f429a8c

3 files changed

Lines changed: 3 additions & 4 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ refs/heads/master: 689bbb466df4b2d5d2483d6edb8ac5c7c7f7c6fa
33
refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
44
refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
55
refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
6-
refs/heads/pubsub-alpha: 18cbb774258a77172a988d7a84c5e559d57b0c95
6+
refs/heads/pubsub-alpha: 942ceb40e3281593afb8da78ced1a9e476284c9c
77
refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
88
refs/heads/update-datastore: 482954f2c5055231e5b3122ea91d2ba00ce8187c
99
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444

branches/pubsub-alpha/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public boolean equals(Object obj) {
177177
}
178178

179179
@Override
180-
public GoogleCredentials credentials() {
180+
public ServiceAccountCredentials credentials() {
181181
return new ServiceAccountCredentials(null, account, privateKey, null, null);
182182
}
183183

branches/pubsub-alpha/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -562,8 +562,7 @@ public URL signUrl(BlobInfo blobInfo, long duration, TimeUnit unit, SignUrlOptio
562562
}
563563
ServiceAccountAuthCredentials authCred =
564564
(ServiceAccountAuthCredentials) optionMap.get(SignUrlOption.Option.SERVICE_ACCOUNT_CRED);
565-
ServiceAccountCredentials cred =
566-
(ServiceAccountCredentials) (authCred != null ? authCred.credentials() : null);
565+
ServiceAccountCredentials cred = authCred != null ? authCred.credentials() : null;
567566
if (authCred == null) {
568567
checkArgument(
569568
this.options().authCredentials() != null

0 commit comments

Comments
 (0)