commit 78da0d7e3a7defe74f691c903b331713c9c2a888
author David Pursehouse <dpursehouse@collab.net> Fri Nov 16 07:47:17 2018 -0800
committer David Pursehouse <dpursehouse@collab.net> Fri Nov 16 07:47:17 2018 -0800
tree f5672f42fca8342362c88578648b96bbb5f31a0d
parent ba0639b379c195c841ea926b8410a355553c9180
parent 395150e41cdbc4bf233a8daeee17fcd4499b0211

Merge branch 'stable-2.16'

* stable-2.16:
  init: fail consistently when plugin is not in the war file

Change-Id: Ib09b14e4b7c609b8d0347bf81e83713fa76a93dd

java/com/google/gerrit/pgm/Init.java

diff --git a/java/com/google/gerrit/pgm/Init.java b/java/com/google/gerrit/pgm/Init.java
index 1739de9..4ea31da 100644
--- a/java/com/google/gerrit/pgm/Init.java
+++ b/java/com/google/gerrit/pgm/Init.java
@@ -245,7 +245,7 @@
   }
 
   private void verifyInstallPluginList(ConsoleUI ui, List<PluginData> plugins) {
-    if (nullOrEmpty(installPlugins) || nullOrEmpty(plugins)) {
+    if (nullOrEmpty(installPlugins)) {
       return;
     }
     Set<String> missing = Sets.newHashSet(installPlugins);