Repository: cassandra Updated Branches: refs/heads/trunk feda54f04 -> 7b533d067
java8 bug? disambiquate (ArrayUtils|StringUtils).isEmpty by not using static imports error: no suitable method found for isEmpty(String) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1bb0c149 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1bb0c149 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1bb0c149 Branch: refs/heads/trunk Commit: 1bb0c149eb9657be1dc4c488156ced617b622ceb Parents: c468c8b Author: Dave Brosius <[email protected]> Authored: Fri Jan 23 20:59:41 2015 -0500 Committer: Dave Brosius <[email protected]> Committed: Fri Jan 23 20:59:41 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/NodeTool.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bb0c149/src/java/org/apache/cassandra/tools/NodeTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java index c2146c6..674b346 100644 --- a/src/java/org/apache/cassandra/tools/NodeTool.java +++ b/src/java/org/apache/cassandra/tools/NodeTool.java @@ -55,6 +55,7 @@ import org.apache.cassandra.streaming.StreamState; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.JVMStabilityInspector; +import org.apache.commons.lang3.ArrayUtils; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Throwables.getStackTraceAsString; @@ -63,7 +64,6 @@ import static com.google.common.collect.Lists.newArrayList; import static java.lang.Integer.parseInt; import static java.lang.String.format; import static org.apache.commons.lang3.ArrayUtils.EMPTY_STRING_ARRAY; -import static org.apache.commons.lang3.ArrayUtils.isEmpty; import static org.apache.commons.lang3.StringUtils.*; public class NodeTool @@ -1019,7 +1019,7 @@ public class NodeTool long[] estimatedRowSizeHistogram = store.getEstimatedRowSizeHistogram(); long[] estimatedColumnCountHistogram = store.getEstimatedColumnCountHistogram(); - if (isEmpty(estimatedRowSizeHistogram) || isEmpty(estimatedColumnCountHistogram)) + if (ArrayUtils.isEmpty(estimatedRowSizeHistogram) || ArrayUtils.isEmpty(estimatedColumnCountHistogram)) { System.err.println("No SSTables exists, unable to calculate 'Partition Size' and 'Cell Count' percentiles"); }
