From 95b4cc8bc5713242930df2c4ce2842e780e8c2a3 Mon Sep 17 00:00:00 2001 From: chrjohn Date: Tue, 19 Jun 2018 16:48:23 +0200 Subject: [PATCH 1/2] Minor cleanup. - Make sure QF_SESSION attribute gets removed in any case. SingleThreadedEventHandlingStrategy.onMessage might throw an Exception. --- .../src/main/java/quickfix/mina/AbstractIoHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quickfixj-core/src/main/java/quickfix/mina/AbstractIoHandler.java b/quickfixj-core/src/main/java/quickfix/mina/AbstractIoHandler.java index 5e60c0e1d2..424d0d07c0 100644 --- a/quickfixj-core/src/main/java/quickfix/mina/AbstractIoHandler.java +++ b/quickfixj-core/src/main/java/quickfix/mina/AbstractIoHandler.java @@ -110,12 +110,12 @@ public void sessionClosed(IoSession ioSession) throws Exception { Session quickFixSession = findQFSession(ioSession); if (quickFixSession != null) { eventHandlingStrategy.onMessage(quickFixSession, EventHandlingStrategy.END_OF_STREAM); - ioSession.removeAttribute(SessionConnector.QF_SESSION); } - ioSession.closeNow(); } catch (Exception e) { - ioSession.closeNow(); throw e; + } finally { + ioSession.closeNow(); + ioSession.removeAttribute(SessionConnector.QF_SESSION); } } From fd83462cf55fb7faf9cd2039ec7ea902771aa79f Mon Sep 17 00:00:00 2001 From: chrjohn Date: Tue, 19 Jun 2018 16:53:53 +0200 Subject: [PATCH 2/2] Restored order of statements. --- .../src/main/java/quickfix/mina/AbstractIoHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickfixj-core/src/main/java/quickfix/mina/AbstractIoHandler.java b/quickfixj-core/src/main/java/quickfix/mina/AbstractIoHandler.java index 424d0d07c0..8a27199b7d 100644 --- a/quickfixj-core/src/main/java/quickfix/mina/AbstractIoHandler.java +++ b/quickfixj-core/src/main/java/quickfix/mina/AbstractIoHandler.java @@ -114,8 +114,8 @@ public void sessionClosed(IoSession ioSession) throws Exception { } catch (Exception e) { throw e; } finally { - ioSession.closeNow(); ioSession.removeAttribute(SessionConnector.QF_SESSION); + ioSession.closeNow(); } }