From ee2ad8affeff0806c8dab4842e007efe17c6f765 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Fri, 27 Apr 2018 14:21:57 -0500 Subject: [PATCH] move super call in merge! so that it returns the proper value --- lib/msf/core/data_store.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/msf/core/data_store.rb b/lib/msf/core/data_store.rb index 13c81aba48..3ff449973d 100644 --- a/lib/msf/core/data_store.rb +++ b/lib/msf/core/data_store.rb @@ -235,12 +235,13 @@ class DataStore < Hash # Override merge! so that we merge the aliases and imported hashes # def merge!(other) - super if other.is_a? DataStore self.aliases.merge!(other.aliases) self.imported.merge!(other.imported) self.imported_by.merge!(other.imported_by) end + # call super last so that we return a reference to ourselves + super end #