Merge pull request rails#6711 from takkanm/fix-warning-LoadError-path…

…-method fix method redefined warning in Ruby2.0
jkraemer · Jun 12, 2012 · 122f6de · 122f6de
2 parents 5ea2b11 + a599c03
commit 122f6de
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/activesupport/lib/active_support/core_ext/load_error.rb b/activesupport/lib/active_support/core_ext/load_error.rb
@@ -6,12 +6,14 @@ class LoadError
     /^cannot load such file -- (.+)$/i,
   ]
 
-  def path
-    @path ||= begin
-      REGEXPS.find do |regex|
-        message =~ regex
+  unless method_defined?(:path)
+    def path
+      @path ||= begin
+        REGEXPS.find do |regex|
+          message =~ regex
+        end
+        $1
       end
-      $1
     end
   end