From db358c8b53f7ba3084c5566c9abf4033bf29783f Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Tue, 1 Sep 2020 19:00:17 +0200 Subject: [PATCH] fix: prevent NPE in RemoteStorageHelper.cleanBuckets (#492) The method getEventBasedHold and getTemporaryHold return Boolean objects which are either true, false or null. In case of a null value, this produced a NPE. --- .../com/google/cloud/storage/testing/RemoteStorageHelper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/testing/RemoteStorageHelper.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/testing/RemoteStorageHelper.java index eb18e4a7c..695fb4371 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/testing/RemoteStorageHelper.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/testing/RemoteStorageHelper.java @@ -88,7 +88,8 @@ public void run() { Storage.BlobField.EVENT_BASED_HOLD, Storage.BlobField.TEMPORARY_HOLD)) .iterateAll()) { - if (blob.getEventBasedHold() == true || blob.getTemporaryHold() == true) { + if (Boolean.TRUE.equals(blob.getEventBasedHold()) + || Boolean.TRUE.equals(blob.getTemporaryHold())) { storage.update( blob.toBuilder().setTemporaryHold(false).setEventBasedHold(false).build(), Storage.BlobTargetOption.userProject(