Merge with current branch

This commit is contained in:
Polina Dudnik 2009-08-14 15:30:25 -05:00
commit ee3226d973

View file

@ -309,7 +309,7 @@ class CacheController < NetPort
cache.controller = self cache.controller = self
} }
if !@@total_cache_controllers.has_key?(mach_type) if !@@total_cache_controllers.key?(mach_type)
@@total_cache_controllers[mach_type] = 0 @@total_cache_controllers[mach_type] = 0
end end
@version = @@total_cache_controllers[mach_type] @version = @@total_cache_controllers[mach_type]