diff options
Diffstat (limited to 'clustercontroller-core')
2 files changed, 3 insertions, 7 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AggregatedClusterStats.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AggregatedClusterStats.java index 7a00627f7ae..ce2cd19b578 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AggregatedClusterStats.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AggregatedClusterStats.java @@ -6,8 +6,8 @@ package com.yahoo.vespa.clustercontroller.core; */ public interface AggregatedClusterStats { - public boolean hasUpdatesFromAllDistributors(); + boolean hasUpdatesFromAllDistributors(); - public ContentClusterStats getStats(); + ContentClusterStats getStats(); } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AggregatedStatsMergePendingChecker.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AggregatedStatsMergePendingChecker.java index 71a582a2a4b..88b7d0d877b 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AggregatedStatsMergePendingChecker.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AggregatedStatsMergePendingChecker.java @@ -26,11 +26,7 @@ public class AggregatedStatsMergePendingChecker implements MergePendingChecker { ContentNodeStats nodeStats = stats.getStats().getContentNode(contentNodeIndex); if (nodeStats != null) { ContentNodeStats.BucketSpaceStats bucketSpaceStats = nodeStats.getBucketSpace(bucketSpace); - if (bucketSpaceStats != null && bucketSpaceStats.mayHaveBucketsPending()) { - return true; - } else { - return false; - } + return (bucketSpaceStats != null && bucketSpaceStats.mayHaveBucketsPending()); } return true; } |