Merge remote-tracking branch 'upstream/pull/2413'

[rails.git] / lib / session_persistence.rb

diff --git a/lib/session_persistence.rb b/lib/session_persistence.rb
index 7d42b71e76f54ffde025fb34056367351e98d1cf..6bd05f5ce7fb58a74ad013c95f23f9d8d3e822c7 100644 (file)
--- a/lib/session_persistence.rb
+++ b/lib/session_persistence.rb
@@ -41,7 +41,7 @@ module SessionPersistence
   #   session_expires_after 1.hour
   #   session_expires_after 2.weeks
   def session_expires_after(seconds)
-    session[session_persistence_key] = seconds
+    session[session_persistence_key] = seconds.to_i
   end
 
   # Expire the session.
@@ -52,10 +52,8 @@ module SessionPersistence
 
   # Filter callback
   def persist_session
-    if session[session_persistence_key]
-      request.session_options[:expire_after] = session[session_persistence_key]
-    end
-  rescue
+    request.session_options[:expire_after] = session[session_persistence_key] if session[session_persistence_key]
+  rescue StandardError
     reset_session
   end
 end