From cbd679e61096babeeb33560a88b13baa45679c7c Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 10 Nov 2015 23:18:41 -0800 Subject: [PATCH] BanCommitCommand: Do not use commons.collections Bug: Issue 3662 Change-Id: I7d6656f71fe9dea1b93a3f2fcc247104f7848f1a --- gerrit-sshd/BUCK | 1 - .../java/com/google/gerrit/sshd/commands/BanCommitCommand.java | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/gerrit-sshd/BUCK b/gerrit-sshd/BUCK index f4ff65bc29..701ef4dd6a 100644 --- a/gerrit-sshd/BUCK +++ b/gerrit-sshd/BUCK @@ -20,7 +20,6 @@ java_library( '//lib:jsch', '//lib/auto:auto-value', '//lib/commons:codec', - '//lib/commons:collections', '//lib/guice:guice', '//lib/guice:guice-assistedinject', '//lib/guice:guice-servlet', # SSH should not depend on servlet diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BanCommitCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BanCommitCommand.java index 647d28d650..485d10f2db 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BanCommitCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BanCommitCommand.java @@ -28,7 +28,6 @@ import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; import com.google.inject.Inject; -import org.apache.commons.collections.CollectionUtils; import org.eclipse.jgit.lib.ObjectId; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; @@ -77,7 +76,7 @@ public class BanCommitCommand extends SshCommand { } private void printCommits(List commits, String message) { - if (CollectionUtils.isNotEmpty(commits)) { + if (commits != null && !commits.isEmpty()) { stdout.print(message + ":\n"); stdout.print(Joiner.on(",\n").join(commits)); stdout.print("\n\n");