Simplified code

chrjohn · web-flow · commit c6e43f27bc9f · 2023-12-09T12:33:33.000+01:00
diff --git a/quickfixj-core/src/main/java/quickfix/mina/initiator/AbstractSocketInitiator.java b/quickfixj-core/src/main/java/quickfix/mina/initiator/AbstractSocketInitiator.java
@@ -123,9 +123,8 @@ private void createInitiator(final Session session, final boolean continueInitOn
             throw new ConfigError("Must specify at least one socket address");
         }
 
-        int connectTimeout = 60; // 1 minute by default, matches MINA
-        if (getSettings().isSetting(sessionID, Initiator.SETTING_SOCKET_CONNECT_TIMEOUT)) {
-            connectTimeout = getSettings().getInt(sessionID, Initiator.SETTING_SOCKET_CONNECT_TIMEOUT);
+        // 1 minute by default, matches MINA
+        int connectTimeout = getSettings().getIntOrDefault(sessionID, Initiator.SETTING_SOCKET_CONNECT_TIMEOUT, 60);
         }
 
         SocketAddress localAddress = getLocalAddress(settings, sessionID);

Original file line number	Diff line number	Diff line change
`@@ -123,9 +123,8 @@ private void createInitiator(final Session session, final boolean continueInitOn`
`123`	`123`	`throw new ConfigError("Must specify at least one socket address");`
`124`	`124`	`}`
`125`	`125`
`126`		`- int connectTimeout = 60; // 1 minute by default, matches MINA`
`127`		`- if (getSettings().isSetting(sessionID, Initiator.SETTING_SOCKET_CONNECT_TIMEOUT)) {`
`128`		`- connectTimeout = getSettings().getInt(sessionID, Initiator.SETTING_SOCKET_CONNECT_TIMEOUT);`
	`126`	`+ // 1 minute by default, matches MINA`
	`127`	`+ int connectTimeout = getSettings().getIntOrDefault(sessionID, Initiator.SETTING_SOCKET_CONNECT_TIMEOUT, 60);`
`129`	`128`	`}`
`130`	`129`
`131`	`130`	`SocketAddress localAddress = getLocalAddress(settings, sessionID);`