Merge pull request #223 from mziccard/fix-npe-itstoragetest-afterclass

aozarov · aozarov · commit 21712519d782 · 2015-10-08T11:15:24.000-07:00
Check storage not null before deleting bucket in ITStorageTest
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -66,7 +66,7 @@ public static void beforeClass() {
   @AfterClass
   public static void afterClass()
       throws ExecutionException, TimeoutException, InterruptedException {
-    if (!RemoteGcsHelper.forceDelete(storage, bucket, 5, TimeUnit.SECONDS)) {
+    if (storage != null && !RemoteGcsHelper.forceDelete(storage, bucket, 5, TimeUnit.SECONDS)) {
       if (log.isLoggable(Level.WARNING)) {
         log.log(Level.WARNING, "Deletion of bucket {0} timed out, bucket is not empty", bucket);
       }

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public static void beforeClass() {`
`66`	`66`	`@AfterClass`
`67`	`67`	`public static void afterClass()`
`68`	`68`	`throws ExecutionException, TimeoutException, InterruptedException {`
`69`		`- if (!RemoteGcsHelper.forceDelete(storage, bucket, 5, TimeUnit.SECONDS)) {`
	`69`	`+ if (storage != null && !RemoteGcsHelper.forceDelete(storage, bucket, 5, TimeUnit.SECONDS)) {`
`70`	`70`	`if (log.isLoggable(Level.WARNING)) {`
`71`	`71`	`log.log(Level.WARNING, "Deletion of bucket {0} timed out, bucket is not empty", bucket);`
`72`	`72`	`}`