Merge pull request #775 from wajncn/fix-npe

chrjohn · web-flow · commit d7c9fe52fabd · 2024-03-14T18:06:05.000+01:00
Correct NullPointerException on `UseDataDictionary=N` and FIXT session
diff --git a/quickfixj-core/src/main/java/quickfix/Session.java b/quickfixj-core/src/main/java/quickfix/Session.java
@@ -2163,7 +2163,7 @@ private void nextLogon(Message logon) throws FieldNotFound, RejectLogon, Incorre
             throw new RejectLogon("Logon attempt not within session time");
         }
 
-        if (sessionID.isFIXT()) {
+        if (sessionID.isFIXT() && dataDictionaryProvider != null) {
             final DataDictionary dictionary = dataDictionaryProvider
                     .getSessionDataDictionary(sessionID.getBeginString());
             if (dictionary != null) {

Original file line number	Diff line number	Diff line change
`@@ -2163,7 +2163,7 @@ private void nextLogon(Message logon) throws FieldNotFound, RejectLogon, Incorre`
`2163`	`2163`	`throw new RejectLogon("Logon attempt not within session time");`
`2164`	`2164`	`}`
`2165`	`2165`
`2166`		`- if (sessionID.isFIXT()) {`
	`2166`	`+ if (sessionID.isFIXT() && dataDictionaryProvider != null) {`
`2167`	`2167`	`final DataDictionary dictionary = dataDictionaryProvider`
`2168`	`2168`	`.getSessionDataDictionary(sessionID.getBeginString());`
`2169`	`2169`	`if (dictionary != null) {`