From 48d37f340299f2f0d43c47f0c6e890cb79e5cdd2 Mon Sep 17 00:00:00 2001 From: Benny Halevy Date: Mon, 1 Nov 2021 13:45:08 +0200 Subject: [PATCH] StorageService: scrub: fix scrubMode is empty condition `!=` compares references not values. Use !"".equals(scrubMode) instead, as it also covers the null scrubMode case. Signed-off-by: Benny Halevy Closes #179 --- src/main/java/org/apache/cassandra/service/StorageService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/cassandra/service/StorageService.java b/src/main/java/org/apache/cassandra/service/StorageService.java index 146e350..a843699 100644 --- a/src/main/java/org/apache/cassandra/service/StorageService.java +++ b/src/main/java/org/apache/cassandra/service/StorageService.java @@ -1812,7 +1812,7 @@ public class StorageService extends MetricsMBean implements StorageServiceMBean, throws IOException, ExecutionException, InterruptedException { MultivaluedMap queryParams = new MultivaluedHashMap(); APIClient.set_bool_query_param(queryParams, "disable_snapshot", disableSnapshot); - if (scrubMode != "") { + if (!"".equals(scrubMode)) { APIClient.set_query_param(queryParams, "scrub_mode", scrubMode); } APIClient.set_query_param(queryParams, "cf", APIClient.join(columnFamilies));