Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d992aa349a10
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6e79fafe2556
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 5, 2017

  1. help classpath: canonicalization on Windows to fully resolve #4145 

    has been attempted at cbf9a7d
... using a fake root path, however on Windows /SMT expands as C:\SMT

added '__' at the end so its more obvious if this is slightly off again

closes #4630 (also #4645)
    @kares
    kares committed Jun 5, 2017
    Copy the full SHA
    7b3be4f View commit details

Commits on Jun 6, 2017

  1. Merge pull request #4647 from kares/test-fake-path-redo-4145 

    help classpath: canonicalization on Windows to fully resolve #4145
    @headius
    headius authored Jun 6, 2017
    Copy the full SHA
    6e79faf View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 core/src/main/java/org/jruby/RubyFile.java
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/RubyFile.java
View file
Original file line number Diff line number Diff line change
@@ -1663,8 +1663,8 @@ private static IRubyObject expandPathInternal(ThreadContext context, IRubyObject
relativePath = relativePath.substring(offset);

if (classloaderURI) {
String fakePrefix = "/THIS_IS_A_FAKE_PATH_FOR_JRUBY";
relativePath = canonicalizePath(fakePrefix + "/" + relativePath).substring(fakePrefix.length());
String fakePrefix = Platform.IS_WINDOWS ? "C:/FAKEPATH_PREFIX__" : "/FAKEPATH_PREFIX__";
relativePath = canonicalizePath(fakePrefix + '/' + relativePath).substring(fakePrefix.length());
} else {
relativePath = canonicalizePath(relativePath);
}