AcceptorTemplate sessions do no longer work (#386)

* Added unit test that will expose problem with template session
* Moved logic for template session into `setupSession()` method.
 - now usage of socket descriptor is more clear

Author: chrjohn

quickfixj-core/src/main/java/quickfix/mina/acceptor/AbstractSocketAcceptor.java

@@ -164,8 +164,8 @@ private IoAcceptor getIoAcceptor(AcceptorSocketDescriptor socketDescriptor) thro
         return ioAcceptor;
     }
 
-    private AcceptorSocketDescriptor getAcceptorSocketDescriptor(SessionSettings settings,
-            SessionID sessionID) throws ConfigError, FieldConvertError {
+    private void setupSession(SessionSettings settings, SessionID sessionID, boolean isTemplate, Map<SessionID, Session> allSessions)
+            throws ConfigError, FieldConvertError {
         int acceptTransportType = ProtocolFactory.SOCKET;
         if (settings.isSetting(sessionID, Acceptor.SETTING_SOCKET_ACCEPT_PROTOCOL)) {
             try {
@@ -210,7 +210,11 @@ && getSettings().getBool(sessionID, SSLSupport.SETTING_USE_SSL)) {
             socketDescriptorForAddress.put(acceptorAddress, descriptor);
         }
 
-        return descriptor;
+        if (!isTemplate) {
+            Session session = sessionFactory.create(sessionID, settings);
+            descriptor.acceptSession(session);
+            allSessions.put(sessionID, session);
+        }
     }
 
     private boolean equals(Object object1, Object object2) {
@@ -238,12 +242,7 @@ private void createSessions(SessionSettings settings, boolean continueInitOnErro
                         }
                     }
 
-                    if (!isTemplate) {
-                        AcceptorSocketDescriptor descriptor = getAcceptorSocketDescriptor(settings, sessionID);
-                        Session session = sessionFactory.create(sessionID, settings);
-                        descriptor.acceptSession(session);
-                        allSessions.put(sessionID, session);
-                    }
+                    setupSession(settings, sessionID, isTemplate, allSessions);
                 }
             } catch (Throwable t) {
                 if (continueInitOnError) {

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

@@ -247,6 +247,35 @@ public void testAcceptorContinueInitializationOnError() throws ConfigError, Inte
         acceptor.stop();
     }
 
+    /**
+     * Ensure that an Acceptor can be started that only has a template session.
+     */
+    @Test
+    public void testAcceptorTemplate() throws ConfigError, InterruptedException, IOException {
+        final int port = AvailablePortFinder.getNextAvailable();
+        final SessionSettings settings = new SessionSettings();
+        final SessionID sessionId = new SessionID("FIX.4.4", "SENDER", "TARGET");
+        settings.setString("ConnectionType", "acceptor");
+        settings.setString("StartTime", "00:00:00");
+        settings.setString("EndTime", "00:00:00");
+        settings.setString("HeartBtInt", "30");
+        settings.setString("BeginString", "FIX.4.4");
+        settings.setLong(sessionId, "SocketAcceptPort", port);
+        settings.setString(sessionId, Acceptor.SETTING_ACCEPTOR_TEMPLATE, "Y");
+
+        final SocketAcceptor acceptor = new SocketAcceptor(new ApplicationAdapter(), new MemoryStoreFactory(), settings,
+                new ScreenLogFactory(settings), new DefaultMessageFactory());
+        acceptor.start();
+
+        for (IoAcceptor endpoint : acceptor.getEndpoints()) {
+            boolean containsFIXCodec = endpoint.getFilterChain().contains(FIXProtocolCodecFactory.FILTER_NAME);
+            assertTrue(containsFIXCodec);
+        }
+
+        acceptor.stop();
+    }
+
+
     private void checkThreads(ThreadMXBean bean, int expectedNum) {
         ThreadInfo[] dumpAllThreads = bean.dumpAllThreads(false, false);
         int qfjMPThreads = 0;