From 941eef3f5211bfb4596a540d4c1a4f8298ac48be Mon Sep 17 00:00:00 2001
From: Colin DuPlantis <colin@marketcetera.com>
Date: Thu, 16 Sep 2021 10:01:28 -0700
Subject: [PATCH] #519 - Update logic to cover non-stop sessions

---
 .../marketcetera/brokers/service/BrokerServiceImpl.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fix/fix-server/src/main/java/org/marketcetera/brokers/service/BrokerServiceImpl.java b/fix/fix-server/src/main/java/org/marketcetera/brokers/service/BrokerServiceImpl.java
index 4343b907c2..b5e079ada9 100644
--- a/fix/fix-server/src/main/java/org/marketcetera/brokers/service/BrokerServiceImpl.java
+++ b/fix/fix-server/src/main/java/org/marketcetera/brokers/service/BrokerServiceImpl.java
@@ -676,6 +676,14 @@ public boolean isSessionTime(SessionID inSessionId)
                 result = false;
                 return result;
             }
+            String rawNonStopSession = StringUtils.trimToNull(session.getSessionSettings().get(quickfix.Session.SETTING_NON_STOP_SESSION));
+            if(rawNonStopSession != null) {
+                boolean nonStopSession = StringUtils.equalsIgnoreCase(rawNonStopSession,"Y");
+                if(nonStopSession) {
+                    result = true;
+                    return result;
+                }
+            }
             String rawDaysValue = StringUtils.trimToNull(session.getSessionSettings().get(BrokerConstants.sessionDaysKey));
             if(rawDaysValue == null) {
                 SLF4JLoggerProxy.debug(this,