From mboxrd@z Thu Jan 1 00:00:00 1970 From: rlane@club.cc.cmu.edu (Rich Lane) Date: Sat, 20 Jun 2009 13:50:17 -0700 Subject: [sup-talk] [PATCH 18/18] dont using SavingHash#[] for membership test In-Reply-To: <1245531017-9907-18-git-send-email-rlane@club.cc.cmu.edu> References: <1245531017-9907-1-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-2-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-3-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-4-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-5-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-6-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-7-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-8-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-9-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-10-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-11-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-12-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-13-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-14-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-15-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-16-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-17-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-18-git-send-email-rlane@club.cc.cmu.edu> Message-ID: <1245531017-9907-19-git-send-email-rlane@club.cc.cmu.edu> --- lib/sup/thread.rb | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/sup/thread.rb b/lib/sup/thread.rb index 99f21dc..d395c35 100644 --- a/lib/sup/thread.rb +++ b/lib/sup/thread.rb @@ -310,13 +310,15 @@ class ThreadSet private :prune_thread_of def remove_id mid - return unless(c = @messages[mid]) + return unless @messages.member?(mid) + c = @messages[mid] remove_container c prune_thread_of c end def remove_thread_containing_id mid - c = @messages[mid] or return + return unless @messages.member?(mid) + c = @messages[mid] t = c.root.thread @threads.delete_if { |key, thread| t == thread } end @@ -355,7 +357,7 @@ class ThreadSet return if threads.size < 2 containers = threads.map do |t| - c = @messages[t.first.id] + c = @messages.member?(c) ? @messages[t.first.id] : nil raise "not in threadset: #{t.first.id}" unless c && c.message c end -- 1.6.0.4