[TH2-5073] Handle all exception types that can be trown during execution

th2-net · Sep 19, 2023 · a3dfce9 · a3dfce9
1 parent 41a5dd8
commit a3dfce9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/com/exactpro/th2/act/ActHandler.java b/src/main/java/com/exactpro/th2/act/ActHandler.java
@@ -194,6 +194,7 @@ public void sendRawMessage(SendRawMessageRequest request, StreamObserver<SendRaw
             if (Context.current().isCancelled()) {
                 LOGGER.warn("'{}' request cancelled by client", actName);
                 sendRawMessageErrorResponse(responseObserver, "Request has been cancelled by client");
+                return;
             }
 
             try {
@@ -210,7 +211,7 @@ public void sendRawMessage(SendRawMessageRequest request, StreamObserver<SendRaw
             responseObserver.onNext(response);
             responseObserver.onCompleted();
 
-        } catch (RuntimeException | IOException e) {
+        } catch (Exception e) {
             LOGGER.error("Failed to send a message. Message = {}", request.getRaw(), e);
             sendRawMessageErrorResponse(responseObserver, "Send message failed. Error: " + e.getMessage());
         } finally {