diff options
author | Nasser Grainawi <nasser@codeaurora.org> | 2021-01-08 15:04:22 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-01-08 15:04:22 +0000 |
commit | 8d9e3006a1bbc66b8571f69dac488fe244f1652e (patch) | |
tree | 0d1af69e5df1faab0c5b78b522db0772744d40f4 | |
parent | 43d9032c94111f4eb040bc6f2f28c4cd860d9e2e (diff) | |
parent | 0e14f415e90e32603c3c055a83fcaa72c1a9b942 (diff) |
Merge "AliasConfig: Pass recursive=true into getNames() JGit methods" into stable-3.2
-rw-r--r-- | java/com/google/gerrit/server/config/HasOperandAliasConfig.java | 2 | ||||
-rw-r--r-- | java/com/google/gerrit/server/config/OperatorAliasConfig.java | 2 |
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)); } } |