Skip to content

Commit

Permalink
Merge pull request #5117 from jruby/revert-5109-bug/fix_require_symlink
Browse files Browse the repository at this point in the history
Revert "Require real path"
headius authored Mar 27, 2018

Verified

This commit was signed with the committer’s verified signature.
2 parents 107dfbf + 8aef4af commit 0cdd2f9
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java
Original file line number Diff line number Diff line change
@@ -167,16 +167,6 @@ private FoundLibrary findFileResourceWithLoadPath(String searchName, String suff
DebugLog.Resource.logTry(pathWithSuffix);
FileResource resource = JRubyFile.createResourceAsFile(runtime, pathWithSuffix);
if (resource.exists()) {
if (resource.absolutePath() != resource.canonicalPath()) {
FileResource realResource = JRubyFile.createResourceAsFile(runtime, resource.canonicalPath());
if (realResource.exists()){
resource = realResource;
String scriptName = resolveScriptName(resource, resource.canonicalPath());
String loadName = resolveLoadName(resource, searchName + suffix);
return new FoundLibrary(ResourceLibrary.create(searchName, scriptName, resource), loadName);
}
}

DebugLog.Resource.logFound(pathWithSuffix);
String scriptName = resolveScriptName(resource, pathWithSuffix);
String loadName = resolveLoadName(resource, searchName + suffix);

0 comments on commit 0cdd2f9

Please sign in to comment.