summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNasser Grainawi <nasser@codeaurora.org>2021-01-07 20:56:11 -0700
committerNasser Grainawi <nasser@codeaurora.org>2021-01-07 21:05:15 -0700
commit0e14f415e90e32603c3c055a83fcaa72c1a9b942 (patch)
tree10d76213b5e8500e6b4f598b3aea9966e62e35f1
parentbb4c39fbcf03eb44da2aefbb88821adc771347b6 (diff)
AliasConfig: Pass recursive=true into getNames() JGit methods
This change solves the operator/operand aliasing not finding content in gerrit.config (it would only be found in secure.config). Change-Id: I10b96225526dc355e668357715f5e60a9d3d9751
-rw-r--r--java/com/google/gerrit/server/config/HasOperandAliasConfig.java2
-rw-r--r--java/com/google/gerrit/server/config/OperatorAliasConfig.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/com/google/gerrit/server/config/HasOperandAliasConfig.java b/java/com/google/gerrit/server/config/HasOperandAliasConfig.java
index 1d79ce0563..7941c04871 100644
--- a/java/com/google/gerrit/server/config/HasOperandAliasConfig.java
+++ b/java/com/google/gerrit/server/config/HasOperandAliasConfig.java
@@ -39,7 +39,7 @@ public class HasOperandAliasConfig {
}
private void loadChangeHasOperandAliases() {
- for (String name : cfg.getNames(SECTION, SUBSECTION_CHANGE)) {
+ for (String name : cfg.getNames(SECTION, SUBSECTION_CHANGE, true)) {
changeQueryHasOperandAliases.put(name, cfg.getString(SECTION, SUBSECTION_CHANGE, name));
}
}
diff --git a/java/com/google/gerrit/server/config/OperatorAliasConfig.java b/java/com/google/gerrit/server/config/OperatorAliasConfig.java
index 0c5fc6e29c..4cdfa4e552 100644
--- a/java/com/google/gerrit/server/config/OperatorAliasConfig.java
+++ b/java/com/google/gerrit/server/config/OperatorAliasConfig.java
@@ -39,7 +39,7 @@ public class OperatorAliasConfig {
}
private void loadChangeOperatorAliases() {
- for (String name : cfg.getNames(SECTION, SUBSECTION_CHANGE)) {
+ for (String name : cfg.getNames(SECTION, SUBSECTION_CHANGE, true)) {
changeQueryOperatorAliases.put(name, cfg.getString(SECTION, SUBSECTION_CHANGE, name));
}
}