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: 986bd8d51435
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6776f0b245d3
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 10, 2014

  1. Don't acquire umask (mutexed) when we're not creating a file.

    @headius
    headius committed Dec 10, 2014
    Copy the full SHA
    307b859 View commit details

  2. Use absolute path, not canonical, for LOADED_FEATURES.

    @headius
    headius committed Dec 10, 2014
    Copy the full SHA
    6776f0b View commit details
Showing with 7 additions and 4 deletions.
  1. +6 −3 core/src/main/java/org/jruby/RubyFile.java
  2. +1 −1 core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java
9 changes: 6 additions & 3 deletions core/src/main/java/org/jruby/RubyFile.java
View file
Original file line number Diff line number Diff line change
@@ -1255,11 +1255,14 @@ protected void sysopenInternal(String path, ModeFlags modes, int perm) {
protected void sysopenInternal19(String path, int oflags, int perm) {
if (path.startsWith("jar:")) path = path.substring(4);

int umask = getUmaskSafe( getRuntime() );
perm = perm - (perm & umask);

ModeFlags modes = ModeFlags.createModeFlags(oflags);

// umask must be acquired under lock, but only for creating a new file
if (modes.isCreate()) {
int umask = getUmaskSafe(getRuntime());
perm = perm - (perm & umask);
}

ChannelDescriptor descriptor = sysopen(path, modes, perm);
openFile.setMainStream(fdopen(descriptor, modes));
}
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java
View file
Original file line number Diff line number Diff line change
@@ -213,7 +213,7 @@ private static boolean isAbsolute(String path) {
}

protected String resolveLoadName(FileResource resource, String ruby18path) {
return resource.canonicalPath();
return resource.absolutePath();
}

protected String resolveScriptName(FileResource resource, String ruby18Path) {