Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/mongo/client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1317,7 +1317,7 @@ def do_close
#
# @api private
def get_session!(options = {})
if options[:session]
if options[:session] && !Session.escaped?
return options[:session].validate!(self)
end

Expand Down
1 change: 1 addition & 0 deletions lib/mongo/session.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

require 'mongo/session/session_pool'
require 'mongo/session/server_session'
require 'mongo/session/session_escapable'

module Mongo

Expand Down
26 changes: 26 additions & 0 deletions lib/mongo/session/session_escapable.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

module Mongo

class Session

class << self
def escape
old_escaped = self.escaped?
self.escaped = true
yield
ensure
self.escaped = old_escaped
end

def escaped?
!!Thread.current["[mongo]:session:escaped"]
end

private

def escaped=(value)
Thread.current["[mongo]:session:escaped"] = !!value
end
end
end
end
Loading