lib/simplecov.rb in simplecov-0.8.1 vs lib/simplecov.rb in simplecov-0.8.2

@@ -1,10 +1,8 @@
 #
 # Code coverage for ruby 1.9. Please check out README for a full introduction.
 #
-require 'lockfile'
-
 module SimpleCov
   class << self
     attr_accessor :running
 
     #
@@ -45,15 +43,11 @@
     def result
       @result ||= SimpleCov::Result.new(Coverage.result) if running
       # If we're using merging of results, store the current result
       # first, then merge the results and return those
       if use_merging
-        lockfile = ::Lockfile.new ResultMerger.resultset_path + '.lockfile'
-
-        lockfile.lock do
-          SimpleCov::ResultMerger.store_result(@result) if @result
-          return SimpleCov::ResultMerger.merged_result
-        end
+        SimpleCov::ResultMerger.store_result(@result) if @result
+        return SimpleCov::ResultMerger.merged_result
       else
         return @result if defined? @result
       end
     ensure
       self.running = false