cancelReceiveTimeout moved after exception creating

eclipse-ditto · Nov 28, 2022 · 88135b6 · 88135b6
1 parent 825fce4
commit 88135b6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...ain/java/org/eclipse/ditto/gateway/service/endpoints/actors/AbstractHttpRequestActor.java b/...ain/java/org/eclipse/ditto/gateway/service/endpoints/actors/AbstractHttpRequestActor.java
@@ -531,12 +531,13 @@ private void handleReceiveTimeout() {
         logger.setCorrelationId(WithDittoHeaders.getCorrelationId(receivedCommand).orElse(null));
         logger.info("Got <{}> after <{}> before an appropriate response arrived.",
                 ReceiveTimeout.class.getSimpleName(), receiveTimeout);
-        actorContext.cancelReceiveTimeout();
 
         if (null != timeoutExceptionSupplier) {
             final var timeoutException = timeoutExceptionSupplier.get();
+            actorContext.cancelReceiveTimeout();
             handleDittoRuntimeException(timeoutException);
         } else {
+            actorContext.cancelReceiveTimeout();
             // This case is a programming error that should not happen at all.
             logger.error("Actor does not have a timeout exception supplier." +
                     " Thus, no DittoRuntimeException could be handled.");