sessionKey null check for command line (#489)

* sessionKey null check for command line * checkstyle adjusted
real-logic · Sep 7, 2023 · 8772c69 · 8772c69
1 parent a38c8a2
commit 8772c69
Showing 1 changed file with 21 additions and 18 deletions.
diff --git a/artio-core/src/main/java/uk/co/real_logic/artio/engine/framer/Framer.java b/artio-core/src/main/java/uk/co/real_logic/artio/engine/framer/Framer.java
@@ -1142,24 +1142,27 @@ private void replySession(
         final long sessionId = sessionInfo.sessionId();
         final CompositeKey sessionKey = sessionInfo.sessionKey();
 
-        final int lastReceivedSequenceNumber = receivedSequenceNumberIndex.lastKnownSequenceNumber(sessionId);
-        final int lastSentSequenceNumber = sentSequenceNumberIndex.lastKnownSequenceNumber(sessionId);
-
-        sessionsEncoder.next()
-            .sessionId(sessionId)
-            .connectionId(connectionId)
-            .lastReceivedSequenceNumber(lastReceivedSequenceNumber)
-            .lastSentSequenceNumber(lastSentSequenceNumber)
-            .lastLogonTime(lastLogonTime)
-            .sequenceIndex(sessionInfo.sequenceIndex())
-            .slowStatus(isSlowConsumer ? SlowStatus.SLOW : SlowStatus.NOT_SLOW)
-            .address(address)
-            .localCompId(sessionKey.localCompId())
-            .localSubId(sessionKey.localSubId())
-            .localLocationId(sessionKey.localLocationId())
-            .remoteCompId(sessionKey.remoteCompId())
-            .remoteSubId(sessionKey.remoteSubId())
-            .remoteLocationId(sessionKey.remoteLocationId());
+        if (sessionKey != null)
+        {
+            final int lastReceivedSequenceNumber = receivedSequenceNumberIndex.lastKnownSequenceNumber(sessionId);
+            final int lastSentSequenceNumber = sentSequenceNumberIndex.lastKnownSequenceNumber(sessionId);
+
+            sessionsEncoder.next()
+                    .sessionId(sessionId)
+                    .connectionId(connectionId)
+                    .lastReceivedSequenceNumber(lastReceivedSequenceNumber)
+                    .lastSentSequenceNumber(lastSentSequenceNumber)
+                    .lastLogonTime(lastLogonTime)
+                    .sequenceIndex(sessionInfo.sequenceIndex())
+                    .slowStatus(isSlowConsumer ? SlowStatus.SLOW : SlowStatus.NOT_SLOW)
+                    .address(address)
+                    .localCompId(sessionKey.localCompId())
+                    .localSubId(sessionKey.localSubId())
+                    .localLocationId(sessionKey.localLocationId())
+                    .remoteCompId(sessionKey.remoteCompId())
+                    .remoteSubId(sessionKey.remoteSubId())
+                    .remoteLocationId(sessionKey.remoteLocationId());
+        }
     }
 
     public void onAdminResetSequenceNumbersRequest(final long correlationId, final long sessionId)