fix

th2-net · Nov 29, 2023 · 8786cb1 · 8786cb1
1 parent 9bfc571
commit 8786cb1
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/main/java/com/exactpro/th2/FixHandler.java b/src/main/java/com/exactpro/th2/FixHandler.java
@@ -634,7 +634,11 @@ private Map<String, String> handleLogon(@NotNull ByteBuf message, Map<String, St
                         recoveryLock.lock();
                         activeRecovery.set(true);
                         Thread.sleep(settings.getCradleSaveTimeoutMs());
-                        strategy.getRecoveryHandler().recovery(nextExpectedSeqNumber, seqNum);
+                        if(!channel.isOpen()) {
+                            LOGGER.warn("Recovery is interrupted.");
+                        } else {
+                            strategy.getRecoveryHandler().recovery(nextExpectedSeqNumber, seqNum);
+                        }
                     } catch (InterruptedException e) {
                         LOGGER.error("Error while waiting for cradle save timeout.", e);
                     } finally {
@@ -787,7 +791,11 @@ private void handleResendRequest(ByteBuf message) {
                 recoveryLock.lock();
                 activeRecovery.set(true);
                 Thread.sleep(settings.getCradleSaveTimeoutMs());
-                strategy.getRecoveryHandler().recovery(beginSeqNo, endSeqNo);
+                if(!channel.isOpen()) {
+                    LOGGER.warn("Recovery is interrupted.");
+                } else {
+                    strategy.getRecoveryHandler().recovery(beginSeqNo, endSeqNo);
+                }
             } catch (InterruptedException e) {
                 LOGGER.error("Error while waiting for cradle save timeout.", e);
             } finally {