Make unit tests work when java dispatching is used by default

2 files changed, 10 insertions, 5 deletions

diff --git a/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Channel.java b/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Channel.java
index f40550f1f70..a4b61803285 100644
--- a/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Channel.java
+++ b/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Channel.java
@@ -199,9 +199,7 @@ public class FS4Channel {
         throws InterruptedException, InvalidChannelException
     {
         ensureValidQ().put(packet);
-        if(monitor != null) {
-            monitor.responseAvailable(this);
-        }
+        notifyMonitor();
     }
 
     /**
@@ -249,4 +247,10 @@ public class FS4Channel {
     public void setResponseMonitor(ResponseMonitor<FS4Channel> monitor) {
         this.monitor = monitor;
     }
+
+    protected void notifyMonitor() {
+        if(monitor != null) {
+            monitor.responseAvailable(this);
+        }
+    }
 }
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
index e98fc830a06..f67641041ad 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
@@ -36,6 +36,7 @@ import java.util.Set;
  * @author ollvir
  */
 public class Dispatcher extends AbstractComponent {
+    private static final boolean INTERNAL_BY_DEFAULT = false;
     private static final int MAX_GROUP_SELECTION_ATTEMPTS = 3;
 
     /** If enabled, this internal dispatcher will be preferred over fdispatch whenever possible */
@@ -76,7 +77,7 @@ public class Dispatcher extends AbstractComponent {
         if (rpcInvoker.isPresent()) {
             return rpcInvoker;
         }
-        if (result.getQuery().properties().getBoolean(dispatchInternal, false)) {
+        if (result.getQuery().properties().getBoolean(dispatchInternal, INTERNAL_BY_DEFAULT)) {
             Optional<FillInvoker> fs4Invoker = fs4InvokerFactory.getFillInvoker(result);
             if (fs4Invoker.isPresent()) {
                 return fs4Invoker;
@@ -86,7 +87,7 @@ public class Dispatcher extends AbstractComponent {
     }
 
     public Optional<SearchInvoker> getSearchInvoker(Query query, FS4InvokerFactory fs4InvokerFactory) {
-        if (multilevelDispatch || ! query.properties().getBoolean(dispatchInternal, false)) {
+        if (multilevelDispatch || ! query.properties().getBoolean(dispatchInternal, INTERNAL_BY_DEFAULT)) {
             return Optional.empty();
         }