---

mziccard · mziccard · commit 23f7802695c6 · 2015-11-17T16:55:42.000+01:00
yaml --- r: 2489 b: refs/heads/update-datastore c: e22e8a3 h: refs/heads/master i: 2487: ef50b33
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: 76cb620fc814083926e03bd981f7aefbf316f4ff
+refs/heads/update-datastore: e22e8a3e6d6052c831f9e9f4237f428a7bb7558a
 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/spi/DefaultStorageRpc.java b/branches/update-datastore/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -368,7 +368,11 @@ public void onSuccess(Void ignore, HttpHeaders responseHeaders) {
 
           @Override
           public void onFailure(GoogleJsonError e, HttpHeaders responseHeaders) {
-            deletes.put(tuple.x(), Tuple.<Boolean, StorageException>of(null, translate(e)));
+            if (e.getCode() == 404) {
+              deletes.put(tuple.x(), Tuple.<Boolean, StorageException>of(Boolean.FALSE, null));
+            } else {
+              deletes.put(tuple.x(), Tuple.<Boolean, StorageException>of(null, translate(e)));
+            }
           }
         });
       }
diff --git a/branches/update-datastore/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/branches/update-datastore/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -644,7 +644,8 @@ public void testBatchRequestFail() {
     assertFalse(batchResponse.gets().get(1).failed());
     assertNull(batchResponse.gets().get(1).get());
     assertTrue(batchResponse.deletes().get(0).failed());
-    assertTrue(batchResponse.deletes().get(1).failed());
+    assertFalse(batchResponse.deletes().get(1).failed());
+    assertFalse(batchResponse.deletes().get(1).get());
     assertTrue(storage.delete(BUCKET, blobName));
   }
 

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,11 @@ public void onSuccess(Void ignore, HttpHeaders responseHeaders) {`
`368`	`368`
`369`	`369`	`@Override`
`370`	`370`	`public void onFailure(GoogleJsonError e, HttpHeaders responseHeaders) {`
`371`		`- deletes.put(tuple.x(), Tuple.<Boolean, StorageException>of(null, translate(e)));`
	`371`	`+ if (e.getCode() == 404) {`
	`372`	`+ deletes.put(tuple.x(), Tuple.<Boolean, StorageException>of(Boolean.FALSE, null));`
	`373`	`+ } else {`
	`374`	`+ deletes.put(tuple.x(), Tuple.<Boolean, StorageException>of(null, translate(e)));`
	`375`	`+ }`
`372`	`376`	`}`
`373`	`377`	`});`
`374`	`378`	`}`
Original file line number	Diff line number	Diff line change
`@@ -644,7 +644,8 @@ public void testBatchRequestFail() {`
`644`	`644`	`assertFalse(batchResponse.gets().get(1).failed());`
`645`	`645`	`assertNull(batchResponse.gets().get(1).get());`
`646`	`646`	`assertTrue(batchResponse.deletes().get(0).failed());`
`647`		`- assertTrue(batchResponse.deletes().get(1).failed());`
	`647`	`+ assertFalse(batchResponse.deletes().get(1).failed());`
	`648`	`+ assertFalse(batchResponse.deletes().get(1).get());`
`648`	`649`	`assertTrue(storage.delete(BUCKET, blobName));`
`649`	`650`	`}`
`650`	`651`