From bcd934b3b6cb4c6ebff108c686edc89c1ead60fe Mon Sep 17 00:00:00 2001
From: Francois Chagnon <francois.chagnon@shopify.com>
Date: Thu, 17 Sep 2020 11:20:43 -0400
Subject: [PATCH] Use model reference from env when it is available

---
 lib/action_dispatch/session/active_record_store.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/action_dispatch/session/active_record_store.rb b/lib/action_dispatch/session/active_record_store.rb
index 4179378..a67979e 100644
--- a/lib/action_dispatch/session/active_record_store.rb
+++ b/lib/action_dispatch/session/active_record_store.rb
@@ -117,6 +117,10 @@ def delete_session(request, session_id, options)
 
       def get_session_model(request, id)
         logger.silence do
+          if (model = request.env[SESSION_RECORD_KEY]) && model.session_id == id
+            return model
+          end
+
           model = @@session_class.find_by_session_id(id)
           if !model
             id = generate_sid
@@ -149,4 +153,3 @@ def logger
     end
   end
 end
-