aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-05-24 09:07:32 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-05-24 09:07:32 -0700
commit4d3c30adb98c580a7de5b5e21ce23dcbc2e6183e (patch)
tree4422328664c719fce6b9d8c97e836f37219cf6b1 /activesupport
parent68d5abeaffd1006b59d0a5dcee666e168d1c4c78 (diff)
parented4f2b9862a46c2a486a4ebcb4e7c706b5e0fd30 (diff)
downloadrails-4d3c30adb98c580a7de5b5e21ce23dcbc2e6183e.tar.gz
rails-4d3c30adb98c580a7de5b5e21ce23dcbc2e6183e.tar.bz2
rails-4d3c30adb98c580a7de5b5e21ce23dcbc2e6183e.zip
Merge pull request #1253 from arunagw/preformance_java_import
import to java_import.
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/testing/performance/jruby.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/performance/jruby.rb b/activesupport/lib/active_support/testing/performance/jruby.rb
index 6b27959840..326904bbac 100644
--- a/activesupport/lib/active_support/testing/performance/jruby.rb
+++ b/activesupport/lib/active_support/testing/performance/jruby.rb
@@ -1,6 +1,6 @@
require 'jruby/profiler'
require 'java'
-import java.lang.management.ManagementFactory
+java_import java.lang.management.ManagementFactory
module ActiveSupport
module Testing