summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@sonymobile.com>2015-11-10 23:18:41 -0800
committerDavid Pursehouse <david.pursehouse@sonymobile.com>2015-11-10 23:40:00 -0800
commitcbd679e61096babeeb33560a88b13baa45679c7c (patch)
tree0a197af98c2a5438cb96d0670e42a36d077fa974
parent08f1cfa977ef1a3d6bac9ec459076c7df4044c15 (diff)
BanCommitCommand: Do not use commons.collections
Bug: Issue 3662 Change-Id: I7d6656f71fe9dea1b93a3f2fcc247104f7848f1a
-rw-r--r--gerrit-sshd/BUCK1
-rw-r--r--gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BanCommitCommand.java3
2 files changed, 1 insertions, 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<String> 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");