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: 9459764370d2
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 27a37492b16b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 5, 2014

  1. do not canonilize path for jruby home on windows for uri-like pathnam… 

    …e - should fix #2042
    @mkristian
    mkristian committed Nov 5, 2014
    Copy the full SHA
    2a2652f View commit details

  2. Merge branch 'jruby-1_7' of github.com:jruby/jruby into jruby-1_7

    @mkristian
    mkristian committed Nov 5, 2014
    Copy the full SHA
    27a3749 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 core/src/main/java/org/jruby/RubyInstanceConfig.java
3 changes: 2 additions & 1 deletion core/src/main/java/org/jruby/RubyInstanceConfig.java
View file
Original file line number Diff line number Diff line change
@@ -348,7 +348,8 @@ private String calculateJRubyHome() {

// RegularFileResource absolutePath will canonicalize resources so that will change c: paths to C:.
// We will cannonicalize on windows so that jruby.home is also C:.
if (Platform.IS_WINDOWS) {
// assume all those uri-like pathnames are already in absolute form
if (Platform.IS_WINDOWS && !newJRubyHome.startsWith("jar:") && !newJRubyHome.startsWith("file:") && !newJRubyHome.startsWith("classpath:") && !newJRubyHome.startsWith("uri:")) {
File file = new File(newJRubyHome);

try {