Permalink
Browse files

LoadService.lockAndRequire() was renamed to LoadService.require() in 8…

  • Loading branch information...
1 parent 215ebe2 commit ef9a3ffe88ed1a9ff4dcf4e682d1b4f8b2551e86 @BanzaiMan BanzaiMan committed Jun 17, 2013
@@ -398,7 +398,7 @@ def requires_string
" String source = new StringBuilder(\"#{source_line}\").toString();\n __ruby__.executeScript(source, \"#{script_name}\");"
else
requires.map do |r|
- " __ruby__.getLoadService().lockAndRequire(\"#{r}\");"
+ " __ruby__.getLoadService().require(\"#{r}\");"
end.join("\n")
end
end
@@ -20,7 +20,7 @@ class DeprecatedClass
private static final Ruby __ruby__ = Ruby.getGlobalRuntime();
private static final RubyClass __metaclass__;
static {
- __ruby__.getLoadService().lockAndRequire("annotated.rb");
+ __ruby__.getLoadService().require("annotated.rb");
RubyClass metaclass = __ruby__.getClass("DeprecatedClass");
metaclass.setClassAllocator(DeprecatedClass.class);
if (metaclass == null) throw new NoClassDefFoundError("Could not load Ruby class: DeprecatedClass");
@@ -30,4 +30,4 @@ class DeprecatedClass
super(__ruby__, __metaclass__);
}
}
-=end
+=end
@@ -29,7 +29,7 @@ def run2(a); end
private static final Ruby __ruby__ = Ruby.getGlobalRuntime();
private static final RubyClass __metaclass__;
static {
- __ruby__.getLoadService().lockAndRequire("overloads.rb");
+ __ruby__.getLoadService().require("overloads.rb");
RubyClass metaclass = __ruby__.getClass("OverloadedClass");
metaclass.setClassAllocator(OverloadedClass.class);
if (metaclass == null) throw new NoClassDefFoundError("Could not load Ruby class: OverloadedClass");
@@ -54,4 +54,4 @@ def run2(a); end
}
}
-=end
+=end
@@ -31,7 +31,7 @@ def test_jruby_will_never_support_annotations
private static final Ruby __ruby__ = Ruby.getGlobalRuntime();
private static final RubyClass __metaclass__;
static {
- __ruby__.getLoadService().lockAndRequire("myruby3.rb");
+ __ruby__.getLoadService().require("myruby3.rb");
RubyClass metaclass = __ruby__.getClass("TestSomething");
metaclass.setClassAllocator(TestSomething.class);
if (metaclass == null) throw new NoClassDefFoundError("Could not load Ruby class: TestSomething");
@@ -56,4 +56,4 @@ def test_jruby_will_never_support_annotations
}
}
-=end
+=end

0 comments on commit ef9a3ff

Please sign in to comment.