commit a443eb43ba9ea7c71c88739696e3d345c7ec9846
author Chih-Hung Hsieh <chh@google.com> Fri Mar 24 13:00:05 2017 -0700
committer Chih-Hung Hsieh <chh@google.com> Fri Mar 24 13:00:05 2017 -0700
tree f32752ea6f33a4d4b15b56eb72627dcbe695e897
parent 6ba11efa0c53853775b5530e4fa198d284193af4

Use only gerrit.config file for now.

Simplify the logic. Maybe add find-owners.config later.

Change-Id: I8479e28ef5c35fa1ad42060a6b97e7d4e8200cba

src/main/java/com/googlesource/gerrit/plugins/findowners/Config.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/findowners/Config.java b/src/main/java/com/googlesource/gerrit/plugins/findowners/Config.java
index 8eb0f84..32fab27 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/findowners/Config.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/findowners/Config.java
@@ -52,17 +52,12 @@
     }
     config = conf;
     PluginConfig gc = config.getFromGerritConfig(pluginName, true);
-    org.eclipse.jgit.lib.Config pc = config.getGlobalPluginConfig(pluginName);
-    // Get config variables from pc, or from gc.
-    addDebugMsg =
-        pc.getBoolean(SECTION, null, ADD_DEBUG_MSG, gc.getBoolean(Config.ADD_DEBUG_MSG, false));
-    reportSyntaxError =
-        pc.getBoolean(
-            SECTION, null, REPORT_SYNTAX_ERROR, gc.getBoolean(REPORT_SYNTAX_ERROR, false));
-    minOwnerVoteLevel =
-        pc.getInt(SECTION, null, MIN_OWNER_VOTE_LEVEL, gc.getInt(MIN_OWNER_VOTE_LEVEL, 1));
-    maxCacheAge = pc.getInt(SECTION, null, MAX_CACHE_AGE, gc.getInt(MAX_CACHE_AGE, 0));
-    maxCacheSize = pc.getInt(SECTION, null, MAX_CACHE_SIZE, gc.getInt(MAX_CACHE_SIZE, 1000));
+    // Get config variables from the plugin section of gerrit.config
+    addDebugMsg = gc.getBoolean(ADD_DEBUG_MSG, false);
+    reportSyntaxError = gc.getBoolean(REPORT_SYNTAX_ERROR, false);
+    minOwnerVoteLevel = gc.getInt(MIN_OWNER_VOTE_LEVEL, 1);
+    maxCacheAge = gc.getInt(MAX_CACHE_AGE, 0);
+    maxCacheSize = gc.getInt(MAX_CACHE_SIZE, 1000);
   }
 
   static boolean getAddDebugMsg() {