Skip to content

Commit

Permalink
Remove .jar.rb extension from load search.
Browse files Browse the repository at this point in the history
  • Loading branch information
headius committed Dec 22, 2014
1 parent d6810e9 commit f5d1f9b
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions core/src/main/java/org/jruby/runtime/load/LoadService.java
Original file line number Diff line number Diff line change
Expand Up @@ -149,23 +149,10 @@ public enum SuffixType {
// NOTE: always search .rb first for speed
public static final String[] sourceSuffixes =
Options.AOT_LOADCLASSES.load() ? arrayOf(".rb", ".class") : arrayOf(".rb");
public static final String[] extensionSuffixes;
public static final String[] extensionSuffixes = arrayOf(".jar");
private static final String[] allSuffixes;

static {
// compute based on platform
// if (Options.CEXT_ENABLED.load()) {
// if (Platform.IS_WINDOWS) {
// extensionSuffixes = new String[]{".jar", ".dll", ".jar.rb"};
// } else if (Platform.IS_MAC) {
// extensionSuffixes = new String[]{".jar", ".bundle", ".jar.rb"};
// } else {
// extensionSuffixes = new String[]{".jar", ".so", ".jar.rb"};
// }
// } else {
// extensionSuffixes = new String[]{".jar", ".jar.rb"};
// }
extensionSuffixes = new String[]{".jar", ".jar.rb"};
allSuffixes = new String[sourceSuffixes.length + extensionSuffixes.length];
System.arraycopy(sourceSuffixes, 0, allSuffixes, 0, sourceSuffixes.length);
System.arraycopy(extensionSuffixes, 0, allSuffixes, sourceSuffixes.length, extensionSuffixes.length);
Expand Down

0 comments on commit f5d1f9b

Please sign in to comment.