commit ee40b8e603f6926532cc62b135cb772e07d9bbed
author David Pursehouse <dpursehouse@collab.net> Fri Sep 30 04:02:11 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 30 04:02:11 2016 +0000
tree 8e0c48b0da75f1c8085049497136b4e2e12164a6
parent 9e0779828d4b9f1aa37a7acf2c9c75ed3cfded09
parent 626d22a9127d104c3126ea80ecc40b410b2361bd

Merge "Fix build"

src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfig.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfig.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfig.java
index 46fc817..581ef99 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfig.java
@@ -100,14 +100,14 @@
     for (ProjectState parentState : projectState.treeInOrder()) {
       PluginConfig parentCfg =
           pluginCfgFactory.getFromProjectConfig(parentState, pluginName);
-      if ("enforced".equals(parentCfg.getString("enabled"))
+      if (!"false".equals(parentCfg.getString("enabled"))
           && isEnabledForBranch(parentState, refName)) {
         return true;
       }
     }
 
-    return pluginCfgFactory.getFromProjectConfigWithInheritance(
-        projectState, pluginName).getBoolean("enabled", false)
+    return !"false".equals(pluginCfgFactory.getFromProjectConfigWithInheritance(
+        projectState, pluginName).getString("enabled", "false"))
         && isEnabledForBranch(projectState, refName);
   }