commit 1e329a13bfc67ec0b4784d59b6e426e9444093d9
author David Pursehouse <david.pursehouse@sonymobile.com> Thu Nov 12 19:03:12 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 12 19:03:12 2015 +0000
tree 9283c8a8aed7551b1f815e3e2d95cacd3a0f96c8
parent b675a4f8118e64cd571e04104b04847663144a73
parent 850d8de460d3177f51e90dd4bcdfd6c6967dee9c

Merge "AccountManager: Update display name only if it is not null." into stable-2.11

gerrit-sshd/BUCK

diff --git a/gerrit-sshd/BUCK b/gerrit-sshd/BUCK
index f4ff65b..701ef4d 100644
--- a/gerrit-sshd/BUCK
+++ b/gerrit-sshd/BUCK
@@ -20,7 +20,6 @@
     '//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

gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BanCommitCommand.java

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 647d28d..485d10f 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.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 @@
   }
 
   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");