Skip to content

Commit d8f093e

Browse files
committed
Use loadFromClassLoader for two more cases
* BigDecimal methods loaded lazily * Java integration loaded at boot
1 parent 14559c7 commit d8f093e

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

core/src/main/java/org/jruby/ext/bigdecimal/BigDecimalLibrary.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ public void load(Ruby runtime, boolean wrap) throws IOException {
4343
RubyBigDecimal.createBigDecimal(context);
4444

4545
// using load since this file does not exist in MRI
46-
loadService(context).load("jruby/bigdecimal.rb", false);
46+
loadService(context).loadFromClassLoader(Ruby.class.getClassLoader(), "jruby/bigdecimal.rb", false);
4747
}
4848
}// BigDecimalLibrary

core/src/main/java/org/jruby/javasupport/Java.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void load(Ruby runtime, boolean wrap) {
139139
RubyClass objectClass = (RubyClass) getProxyClass(context, java.lang.Object.class);
140140

141141
// load Ruby parts of the 'java' library
142-
loadService(context).load("jruby/java.rb", false);
142+
loadService(context).loadFromClassLoader(Ruby.class.getClassLoader(), "jruby/java.rb", false);
143143

144144
// rewire ArrayJavaProxy superclass to point at Object, so it inherits Object behaviors
145145
Access.getClass(context, "ArrayJavaProxy").

0 commit comments

Comments
 (0)