Fixed bugs and addressed review comments

lib/msf/core/modules/metadata/cache.rb

@@ -35,10 +35,10 @@ class Cache
   #  Returns the module data cache, but first ensures all the metadata is loaded
   #
   def get_metadata
-   @mutex.synchronize {
+    @mutex.synchronize {
       wait_for_load
       @module_metadata_cache.values
-   }
+    }
   end
 
   #

lib/msf/core/modules/metadata/obj.rb

@@ -28,7 +28,7 @@ class Obj
   attr_reader :ref_name
 
   def initialize(module_instance, obj_hash = nil)
-    unless (obj_hash.nil?)
+    unless obj_hash.nil?
       init_from_hash(obj_hash)
       return
     end
@@ -75,7 +75,7 @@ class Obj
       'name' => @name,
       'full_name' => @full_name,
       'rank' => @rank,
-      'disclosure_date' => @disclosure_date,
+      'disclosure_date' => @disclosure_date.nil? ? nil : @disclosure_date.to_s,
       'type' => @type,
       'author' => @author,
       'description' => @description,
@@ -86,7 +86,7 @@ class Obj
       'arch' => @arch,
       'rport' => @rport,
       'targets' => @targets,
-      'mod_time' => @mod_time,
+      'mod_time' => @mod_time.to_s,
       'path' => @path,
       'is_install_path' => @is_install_path,
       'ref_name' => @ref_name
@@ -139,8 +139,13 @@ class Obj
 
   def sort_platform_string
     arr = @platform.split(',')
-    if !arr.nil? && arr.length > 1
-      @platform = arr.sort.join(',')
+    unless arr.empty?
+      arr.each {|value| value.strip!}
+      if arr.length > 1
+        @platform = arr.sort.join(',')
+      else
+        @platform = arr[0]
+      end
     end
   end
 

lib/msf/core/modules/metadata/store.rb

@@ -38,7 +38,7 @@ module Msf::Modules::Metadata::Store
           f.write(JSON.pretty_generate(json_map))
         end
       }
-    rescue Exception => e
+    rescue => e
       elog("Unable to update metadata store: #{e.message}")
     end
   end