Inject EventDispatcher as DynamicItem
The multi-site plugin needs to respect the instance that is
currently bound to the EventDispatcher through a DynamicItem.
Failing to get the current DynamicItem causes fundamental regressions
because the custom logic is not executed with unexpected side
effects.
Bug: Issue 13338
Change-Id: I0c6455a8a6d1dbf735ef0648a30ffa6d50981f7d
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwardedEventHandler.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwardedEventHandler.java
index 278ba4e..dcfd1b0 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwardedEventHandler.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwardedEventHandler.java
@@ -14,6 +14,7 @@
package com.googlesource.gerrit.plugins.multisite.forwarder;
+import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.server.events.Event;
import com.google.gerrit.server.events.EventDispatcher;
import com.google.gerrit.server.permissions.PermissionBackendException;
@@ -33,11 +34,12 @@
public class ForwardedEventHandler {
private static final Logger log = LoggerFactory.getLogger(ForwardedEventHandler.class);
- private final EventDispatcher dispatcher;
+ private final DynamicItem<EventDispatcher> dispatcher;
private final OneOffRequestContext oneOffCtx;
@Inject
- public ForwardedEventHandler(EventDispatcher dispatcher, OneOffRequestContext oneOffCtx) {
+ public ForwardedEventHandler(
+ DynamicItem<EventDispatcher> dispatcher, OneOffRequestContext oneOffCtx) {
this.dispatcher = dispatcher;
this.oneOffCtx = oneOffCtx;
}
@@ -51,7 +53,7 @@
try (ManualRequestContext ctx = oneOffCtx.open()) {
Context.setForwardedEvent(true);
log.debug("dispatching event {}", event.getType());
- dispatcher.postEvent(event);
+ dispatcher.get().postEvent(event);
} finally {
Context.unsetForwardedEvent();
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwardedEventHandlerTest.java b/src/test/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwardedEventHandlerTest.java
index 5c36ada..ff6f00e 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwardedEventHandlerTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwardedEventHandlerTest.java
@@ -18,8 +18,10 @@
import static org.junit.Assert.fail;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import com.google.gerrit.exceptions.StorageException;
+import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.server.events.Event;
import com.google.gerrit.server.events.EventDispatcher;
import com.google.gerrit.server.events.ProjectCreatedEvent;
@@ -37,13 +39,15 @@
public class ForwardedEventHandlerTest {
@Rule public ExpectedException exception = ExpectedException.none();
+ @Mock private DynamicItem<EventDispatcher> dispatcherMockItem;
@Mock private EventDispatcher dispatcherMock;
@Mock OneOffRequestContext oneOffCtxMock;
private ForwardedEventHandler handler;
@Before
public void setUp() throws Exception {
- handler = new ForwardedEventHandler(dispatcherMock, oneOffCtxMock);
+ when(dispatcherMockItem.get()).thenReturn(dispatcherMock);
+ handler = new ForwardedEventHandler(dispatcherMockItem, oneOffCtxMock);
}
@Test
