From 208af41f19e68c99b67c15f9bd23545d04503344 Mon Sep 17 00:00:00 2001
From: chrjohn <christoph.john@macd.com>
Date: Thu, 17 May 2018 15:16:12 +0200
Subject: [PATCH 1/2] removed no longer supported boolean flag

---
 .../src/main/java/quickfix/SocketAcceptor.java         | 10 +++-------
 .../src/main/java/quickfix/SocketInitiator.java        | 10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/quickfixj-core/src/main/java/quickfix/SocketAcceptor.java b/quickfixj-core/src/main/java/quickfix/SocketAcceptor.java
index b64f807d57..ca27ebcdfe 100644
--- a/quickfixj-core/src/main/java/quickfix/SocketAcceptor.java
+++ b/quickfixj-core/src/main/java/quickfix/SocketAcceptor.java
@@ -99,19 +99,15 @@ public SocketAcceptor(SessionFactory sessionFactory, SessionSettings settings) t
 
     @Override
     public void start() throws ConfigError, RuntimeError {
-        initialize(true);
+        initialize();
     }
 
-    private void initialize(boolean blockInThread) throws ConfigError {
+    private void initialize() throws ConfigError {
         if (isStarted.equals(Boolean.FALSE)) {
             eventHandlingStrategy.setExecutor(longLivedExecutor);
             startAcceptingConnections();
             isStarted = Boolean.TRUE;
-            if (blockInThread) {
-                eventHandlingStrategy.blockInThread();
-            } else {
-                eventHandlingStrategy.block();
-            }
+            eventHandlingStrategy.blockInThread();
         } else {
             log.warn("Ignored attempt to start already running SocketAcceptor.");
         }
diff --git a/quickfixj-core/src/main/java/quickfix/SocketInitiator.java b/quickfixj-core/src/main/java/quickfix/SocketInitiator.java
index efad4f4045..5ca2d628e0 100644
--- a/quickfixj-core/src/main/java/quickfix/SocketInitiator.java
+++ b/quickfixj-core/src/main/java/quickfix/SocketInitiator.java
@@ -108,7 +108,7 @@ public SocketInitiator(SessionFactory sessionFactory, SessionSettings settings,
 
     @Override
     public void start() throws ConfigError, RuntimeError {
-        initialize(true);
+        initialize();
     }
 
     @Override
@@ -131,7 +131,7 @@ public void stop(boolean forceDisconnect) {
         }
     }
 
-    private void initialize(boolean blockInThread) throws ConfigError {
+    private void initialize() throws ConfigError {
         if (isStarted.equals(Boolean.FALSE)) {
             eventHandlingStrategy.setExecutor(longLivedExecutor);
             createSessionInitiators();
@@ -140,11 +140,7 @@ private void initialize(boolean blockInThread) throws ConfigError {
             }
             startInitiators();
             isStarted = Boolean.TRUE;
-            if (blockInThread) {
-                eventHandlingStrategy.blockInThread();
-            } else {
-                eventHandlingStrategy.block();
-            }
+            eventHandlingStrategy.blockInThread();
         } else {
             log.warn("Ignored attempt to start already running SocketInitiator.");
         }

From d75efe5cbb41daee09afd0273436e61c55f79886 Mon Sep 17 00:00:00 2001
From: chrjohn <christoph.john@macd.com>
Date: Thu, 17 May 2018 15:19:50 +0200
Subject: [PATCH 2/2] made method SingleThreadedEventHandlingStrategy.block()
 private since its external usage is not supported anymore

---
 .../java/quickfix/mina/SingleThreadedEventHandlingStrategy.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickfixj-core/src/main/java/quickfix/mina/SingleThreadedEventHandlingStrategy.java b/quickfixj-core/src/main/java/quickfix/mina/SingleThreadedEventHandlingStrategy.java
index b14f4c6533..163fb129cd 100644
--- a/quickfixj-core/src/main/java/quickfix/mina/SingleThreadedEventHandlingStrategy.java
+++ b/quickfixj-core/src/main/java/quickfix/mina/SingleThreadedEventHandlingStrategy.java
@@ -81,7 +81,7 @@ public SessionConnector getSessionConnector() {
         return sessionConnector;
     }
 
-    public void block() {
+    private void block() {
         while (true) {
             synchronized (this) {
                 if (isStopped) {