Merge "Skip disabled plugins on rescan"

2013-01-08 21:23:46 -08:00
parent d573b956eb dbaaa712f1
commit 56c0fbf48d
1 changed files with 4 additions and 0 deletions
--- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java
@@ -306,6 +306,10 @@ public class PluginLoader implements LifecycleListener {
    dropRemovedDisabledPlugins(jars);

    for (File jar : jars) {
+      if (jar.getName().endsWith(".disabled")) {
+        continue;
+      }
+
      String name = nameOf(jar);
      FileSnapshot brokenTime = broken.get(name);
      if (brokenTime != null && !brokenTime.isModified(jar)) {