Interrupt current thread where applicable.

quickfixj-core/src/main/java/quickfix/mina/SessionConnector.java

@@ -272,6 +272,7 @@ protected void waitForLogout() {
                 Thread.sleep(100L);
             } catch (InterruptedException e) {
                 log.error(e.getMessage(), e);
+                Thread.currentThread().interrupt();
             }
             final long elapsed = System.currentTimeMillis() - start;
             Iterator<Session> sessionItr = loggedOnSessions.iterator();
@@ -375,6 +376,7 @@ public void run() {
             try {
                 delegate.await();
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
             }
         }
 
@@ -449,9 +451,10 @@ public static void closeManagedSessionsAndDispose(IoService ioService, boolean a
                     completed = closeFuture.await(1000, TimeUnit.MILLISECONDS);
                 } catch (InterruptedException ex) {
                     Thread.currentThread().interrupt();
-                }
-                if (!completed) {
-                    logger.warn("Could not close IoSession {}", ioSession);
+                } finally {
+                    if (!completed) {
+                        logger.warn("Could not close IoSession {}", ioSession);
+                    }
                 }
             }
         }

quickfixj-core/src/main/java/quickfix/mina/SingleThreadedEventHandlingStrategy.java

@@ -76,7 +76,7 @@ public void onMessage(Session quickfixSession, Message message) {
             queueTracker.put(new SessionMessageEvent(quickfixSession, message));
         } catch (InterruptedException e) {
             isStopped = true;
-            throw new RuntimeException(e);
+            Thread.currentThread().interrupt();
         }
     }
 
@@ -196,7 +196,8 @@ public void stopHandlingMessages(boolean join) {
             try {
                 messageProcessingThread.join();
             } catch (InterruptedException e) {
-                sessionConnector.log.error("{} interrupted.", MESSAGE_PROCESSOR_THREAD_NAME);
+                sessionConnector.log.warn("{} interrupted.", MESSAGE_PROCESSOR_THREAD_NAME);
+                Thread.currentThread().interrupt();
             }
         }
     }

quickfixj-core/src/main/java/quickfix/mina/ThreadPerSessionEventHandlingStrategy.java

@@ -203,6 +203,7 @@ public void enqueue(Message message) {
                 queueTracker.put(message);
             } catch (final InterruptedException e) {
                 quickfixSession.getLog().onErrorEvent(e.toString());
+                Thread.currentThread().interrupt();
             }
         }
 
@@ -227,6 +228,7 @@ void doRun() {
                     LogUtil.logThrowable(quickfixSession.getSessionID(),
                             "Message dispatcher interrupted", e);
                     stopping = true;
+                    Thread.currentThread().interrupt();
                 } catch (final Throwable e) {
                     LogUtil.logThrowable(quickfixSession.getSessionID(),
                             "Error during message processing", e);

quickfixj-core/src/test/java/quickfix/MultiAcceptorTest.java

@@ -206,6 +206,7 @@ public void waitForLogon() {
             try {
                 logonLatch.await(20, TimeUnit.SECONDS);
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
                 fail(e.getMessage());
             }
         }
@@ -220,6 +221,7 @@ public synchronized void waitForMessages() {
                     fail("Timed out waiting for message");
                 }
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
                 fail(e.getMessage());
             }
         }

quickfixj-core/src/test/java/quickfix/SessionDisconnectConcurrentlyTest.java

@@ -134,6 +134,7 @@ public void waitForLogon() {
             try {
                 logonLatch.await(10, TimeUnit.SECONDS);
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
                 fail(e.getMessage());
             }
         }
@@ -148,6 +149,7 @@ public synchronized void waitForMessages() {
                     fail("Timed out waiting for message");
                 }
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
                 fail(e.getMessage());
             }
         }
@@ -225,7 +227,7 @@ public void run() {
             try {
                 Thread.sleep(12000);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                Thread.currentThread().interrupt();
             }
             threadIds = bean.findDeadlockedThreads();
         }

quickfixj-core/src/test/java/quickfix/mina/LostLogoutTest.java

@@ -144,7 +144,7 @@ public void fromApp(Message message, SessionID sessionId) throws FieldNotFound,
             try {
                 Thread.sleep(1000);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                Thread.currentThread().interrupt();
             }
             System.out.println("Server: message processing end");
         }

quickfixj-core/src/test/java/quickfix/mina/LostLogoutThreadedTest.java

@@ -144,7 +144,7 @@ public void fromApp(Message message, SessionID sessionId) throws FieldNotFound,
             try {
                 Thread.sleep(1000);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                Thread.currentThread().interrupt();
             }
             System.out.println("Server: message processing end");
         }

quickfixj-core/src/test/java/quickfix/mina/SingleThreadedEventHandlingStrategyTest.java

@@ -68,7 +68,7 @@ public void cleanup() {
             try {
                 Thread.sleep(500);
             } catch (InterruptedException ex) {
-                // ignored
+                Thread.currentThread().interrupt();
             }
         }
     }
@@ -373,7 +373,7 @@ private static void assertQFJMessageProcessorThreads(int expected) {
             try {
                 Thread.sleep(100);
             } catch (InterruptedException ex) {
-                // ignored
+                Thread.currentThread().interrupt();
             }
             dumpAllThreads = bean.dumpAllThreads(false, false);
             qfjMPThreads = getMessageProcessorThreads(dumpAllThreads);

quickfixj-core/src/test/java/quickfix/mina/ssl/SSLAndNonSSLTest.java

@@ -214,6 +214,7 @@ public void run() {
                     shutdownLatch.await();
                 } catch (InterruptedException e1) {
                     try {
+                        Thread.currentThread().interrupt();
                         acceptor.stop(true);
                     } catch (RuntimeException e) {
                         e.printStackTrace();

quickfixj-core/src/test/java/quickfix/mina/ssl/SSLCertificateTest.java

@@ -65,6 +65,7 @@ public void cleanup() {
         try {
             Thread.sleep(500);
         } catch (InterruptedException ex) {
+            Thread.currentThread().interrupt();
             java.util.logging.Logger.getLogger(SSLCertificateTest.class.getName()).log(Level.SEVERE, null, ex);
         }
     }

quickfixj-core/src/test/java/quickfix/test/acceptance/ConnectToServerStep.java

@@ -61,7 +61,7 @@ public void run(TestResult result, TestConnection connection) {
             try {
                 Thread.sleep(reconnectDelay);
             } catch (InterruptedException e1) {
-                e1.printStackTrace();
+                Thread.currentThread().interrupt();
             }
         }
         try {

quickfixj-core/src/test/java/quickfix/test/acceptance/TestConnection.java

@@ -68,8 +68,11 @@ private TestIoHandler getIoHandler(int clientId) {
 
     public void tearDown() {
         for (TestIoHandler testIoHandler : ioHandlers.values()) {
-            CloseFuture closeFuture = testIoHandler.getSession().closeNow();
-            closeFuture.awaitUninterruptibly();
+            IoSession session = testIoHandler.getSession();
+            if (session != null) {
+                CloseFuture closeFuture = session.closeNow();
+                closeFuture.awaitUninterruptibly();
+            }
         }
         ioHandlers.clear();
     }
@@ -165,6 +168,7 @@ public IoSession getSession() {
                     }
                 }
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
                 throw new RuntimeException(e);
             }
             return session;