---

mziccard · mziccard · commit 5b92aebd73af · 2015-10-14T22:41:34.000+02:00
yaml --- r: 1037 b: refs/heads/master c: 13572e7 h: refs/heads/master i: 1035: f442819 v: v3
diff --git a/[refs] b/[refs]
@@ -1,4 +1,4 @@
 ---
-refs/heads/master: 301158716e84080b654dd47e623f35f0ef845087
+refs/heads/master: 13572e77e1e0a199d1fa9cc5542e771acfdf027f
 refs/heads/travis: 0fa997e2fc9c6b61b2d91e6d163655aae67d44b6
 refs/heads/gh-pages: 5a10432ecc75f29812e33a8236c900379509fe99
diff --git a/trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java b/trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
@@ -115,6 +115,8 @@ public Blob(Storage storage, BlobInfo info) {
    * @param storage the storage service used for issuing requests
    * @param bucket bucket's name
    * @param blob blob's name
+   * @return the {@code Blob} object or {@code null} if not found.
+   * @throws StorageException upon failure
    */
   public static Blob load(Storage storage, String bucket, String blob) {
     return load(storage, BlobId.of(bucket, blob));
@@ -126,10 +128,12 @@ public static Blob load(Storage storage, String bucket, String blob) {
    * 
    * @param storage the storage service used for issuing requests
    * @param blobId blob's identifier
+   * @return the {@code Blob} object or {@code null} if not found.
+   * @throws StorageException upon failure
    */
   public static Blob load(Storage storage, BlobId blobId) {
     BlobInfo info = storage.get(blobId);
-    return new Blob(storage, info);
+    return info != null ? new Blob(storage, info) : null;
   }
 
   /**
diff --git a/trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -61,10 +61,12 @@ public Bucket(Storage storage, BucketInfo info) {
    * 
    * @param storage the storage service used for issuing requests
    * @param bucket bucket's name
+   * @return the {@code Bucket} object or {@code null} if not found.
+   * @throws StorageException upon failure
    */
   public static Bucket load(Storage storage, String bucket) {
     BucketInfo info = storage.get(bucket);
-    return new Bucket(storage, info);
+    return info != null ? new Bucket(storage, info) : null;
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,12 @@ public Bucket(Storage storage, BucketInfo info) {`
`61`	`61`	`*`
`62`	`62`	`* @param storage the storage service used for issuing requests`
`63`	`63`	`* @param bucket bucket's name`
	`64`	`+ * @return the {@code Bucket} object or {@code null} if not found.`
	`65`	`+ * @throws StorageException upon failure`
`64`	`66`	`*/`
`65`	`67`	`public static Bucket load(Storage storage, String bucket) {`
`66`	`68`	`BucketInfo info = storage.get(bucket);`
`67`		`- return new Bucket(storage, info);`
	`69`	`+ return info != null ? new Bucket(storage, info) : null;`
`68`	`70`	`}`
`69`	`71`
`70`	`72`	`/**`