summaryrefslogtreecommitdiffstats
path: root/jdisc_core
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2023-10-11 21:44:23 +0200
committerjonmv <venstad@gmail.com>2023-10-11 21:44:23 +0200
commitac6c7464aba758270e1aa2674ba8c0d25faed79d (patch)
tree93bd83dc9ef92b3d1cffd11e8926c24f2b686c24 /jdisc_core
parent57deef966539acdd3c96b52701fb29cf9062f6e0 (diff)
Info log message when MbusServer is finally destroyed
Diffstat (limited to 'jdisc_core')
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/handler/FutureConjunction.java2
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/FutureConjunction.java b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/FutureConjunction.java
index 3556fb0a739..8b0cd62df07 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/FutureConjunction.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/FutureConjunction.java
@@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
/**
- * <p>This class implements a Future&lt;Boolean&gt; that is conjunction of zero or more other Future&lt;Boolean&gt;s,
+ * <p>This class implements a Future&lt;Boolean&gt; that is a conjunction of zero or more other Future&lt;Boolean&gt;s,
* i.e. it evaluates to <code>true</code> if, and only if, all its operands evaluate to <code>true</code>. To use this class,
* simply create an instance of it and add operands to it using the {@link #addOperand(CompletableFuture)} method.</p>
*
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java
index 28037ce6fb4..b60b62e3f86 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java
@@ -119,7 +119,7 @@ public abstract class RequestDispatch implements Future<Response>, ResponseHandl
try {
return futureResponse.get();
} catch (InterruptedException | ExecutionException e) {
- throw new IllegalStateException(e); // Should not happens since both futures are complete
+ throw new IllegalStateException(e); // Should not happen since both futures are complete
}
});
}