diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/rinda/tuplespace.rb | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Mon Mar 25 07:09:20 2013 Eric Hodel <drbrain@segment7.net> + + * lib/rinda/tuplespace.rb: Only return tuple entry once on move, + either through port or regular return, not both. This results in a + 120% speedup when combined with #8125. Patch by Joel VanderWerf. + [ruby-trunk - Feature #8119] + Mon Mar 25 06:59:01 2013 Eric Hodel <drbrain@segment7.net> * test/rinda/test_rinda.rb: Skip IPv6 tests if no IPv6 addresses diff --git a/lib/rinda/tuplespace.rb b/lib/rinda/tuplespace.rb index ba494aa4ec..ee2bef1769 100644 --- a/lib/rinda/tuplespace.rb +++ b/lib/rinda/tuplespace.rb @@ -491,7 +491,7 @@ module Rinda port.push(entry.value) if port @bag.delete(entry) notify_event('take', entry.value) - return entry.value + return port ? nil : entry.value end raise RequestExpiredError if template.expired? @@ -506,7 +506,7 @@ module Rinda port.push(entry.value) if port @bag.delete(entry) notify_event('take', entry.value) - return entry.value + return port ? nil : entry.value end template.wait end |