Fix OutOfScopeException: No user on merge thread
Bug: issue 2665
Change-Id: Id980b31fe368e0804e8a63ab4611034aa491bf99
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
diff --git a/its-base/src/main/java/com/googlesource/gerrit/plugins/hooks/its/ItsConfig.java b/its-base/src/main/java/com/googlesource/gerrit/plugins/hooks/its/ItsConfig.java
index 87758d6..6fa5d9b 100644
--- a/its-base/src/main/java/com/googlesource/gerrit/plugins/hooks/its/ItsConfig.java
+++ b/its-base/src/main/java/com/googlesource/gerrit/plugins/hooks/its/ItsConfig.java
@@ -17,7 +17,6 @@
import com.google.gerrit.common.data.RefConfigSection;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.config.PluginConfig;
import com.google.gerrit.server.config.PluginConfigFactory;
import com.google.gerrit.server.events.ChangeAbandonedEvent;
@@ -31,7 +30,6 @@
import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.server.project.RefPatternMatcher;
import com.google.inject.Inject;
-import com.google.inject.Provider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,15 +40,13 @@
private final String pluginName;
private final ProjectCache projectCache;
private final PluginConfigFactory pluginCfgFactory;
- private final Provider<CurrentUser> self;
@Inject
public ItsConfig(@PluginName String pluginName, ProjectCache projectCache,
- PluginConfigFactory pluginCfgFactory, Provider<CurrentUser> self) {
+ PluginConfigFactory pluginCfgFactory) {
this.pluginName = pluginName;
this.projectCache = projectCache;
this.pluginCfgFactory = pluginCfgFactory;
- this.self = self;
}
public boolean isEnabled(ChangeEvent event) {
@@ -116,7 +112,6 @@
}
private boolean match(String branch, String refPattern) {
- return RefPatternMatcher.getMatcher(refPattern)
- .match(branch, self.get().getUserName());
+ return RefPatternMatcher.getMatcher(refPattern).match(branch, null);
}
}
diff --git a/its-base/src/test/java/com/googlesource/gerrit/plugins/hooks/validation/ItsValidateCommentTest.java b/its-base/src/test/java/com/googlesource/gerrit/plugins/hooks/validation/ItsValidateCommentTest.java
index eee33cc..f3fbb12 100644
--- a/its-base/src/test/java/com/googlesource/gerrit/plugins/hooks/validation/ItsValidateCommentTest.java
+++ b/its-base/src/test/java/com/googlesource/gerrit/plugins/hooks/validation/ItsValidateCommentTest.java
@@ -512,7 +512,7 @@
itsFacade = createMock(ItsFacade.class);
bind(ItsFacade.class).toInstance(itsFacade);
- bind(ItsConfig.class).toInstance(new ItsConfig(null, null, null, null) {
+ bind(ItsConfig.class).toInstance(new ItsConfig(null, null, null) {
@Override
public boolean isEnabled(String project, String branch) {
return true;
diff --git a/its-base/src/test/java/com/googlesource/gerrit/plugins/hooks/workflow/ActionControllerTest.java b/its-base/src/test/java/com/googlesource/gerrit/plugins/hooks/workflow/ActionControllerTest.java
index 9668d7d..7266d81 100644
--- a/its-base/src/test/java/com/googlesource/gerrit/plugins/hooks/workflow/ActionControllerTest.java
+++ b/its-base/src/test/java/com/googlesource/gerrit/plugins/hooks/workflow/ActionControllerTest.java
@@ -198,7 +198,7 @@
actionExecutor = createMock(ActionExecutor.class);
bind(ActionExecutor.class).toInstance(actionExecutor);
- bind(ItsConfig.class).toInstance(new ItsConfig(null, null, null, null) {
+ bind(ItsConfig.class).toInstance(new ItsConfig(null, null, null) {
@Override
public boolean isEnabled(ChangeEvent event) {
return true;
