Skip to content

Eliminates cursor leak in database #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 3, 2012
Merged

Eliminates cursor leak in database #117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions lib/mongo/collection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,11 @@ def find(selector={}, opts={})
})

if block_given?
yield cursor
cursor.close
begin
yield cursor
ensure
cursor.close
end
nil
else
cursor
Expand Down Expand Up @@ -594,7 +597,7 @@ def find_and_modify(opts={})

@db.command(cmd)['value']
end

# Perform an aggregation using the aggregation framework on the current collection.
# @note Aggregate requires server version >= 2.1.1
# @note Field References: Within an expression, field names must be quoted and prefixed by a dollar sign ($).
Expand Down Expand Up @@ -636,10 +639,10 @@ def aggregate(pipeline=nil)
unless Mongo::Support.ok?(result)
raise Mongo::OperationFailure, "aggregate failed: #{result['errmsg']}"
end

return result["result"]
end

# Perform a map-reduce operation on the current collection.
#
# @param [String, BSON::Code] map a map function, written in JavaScript.
Expand Down