jruby · Dec 8, 2014 · Dec 8, 2014 · Dec 8, 2014
Showing with 11 additions and 12 deletions.

+6 −3 core/src/main/java/org/jruby/RubyFile.java

+4 −8 core/src/main/java/org/jruby/common/RubyWarnings.java

+1 −1 core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java
diff --git a/core/src/main/java/org/jruby/RubyFile.java b/core/src/main/java/org/jruby/RubyFile.java
@@ -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));
     }

diff --git a/core/src/main/java/org/jruby/common/RubyWarnings.java b/core/src/main/java/org/jruby/common/RubyWarnings.java
@@ -126,7 +126,7 @@ public void warning(String message) {
 
     @Override
     public void warning(ID id, String message) {
-        if (!runtime.warningsEnabled()) return;
+        if (!runtime.warningsEnabled() || !runtime.isVerbose()) return;
 
         RubyStackTraceElement[] stack = getRubyStackTrace(runtime);
         String file;
@@ -148,8 +148,6 @@ public void warning(ID id, String message) {
      */
     @Override
     public void warning(ID id, ISourcePosition position, String message) {
-        if (!runtime.warningsEnabled()) return;
-
         warning(id, position.getFile(), position.getStartLine() + 1, message);
     }
 
@@ -158,9 +156,7 @@ public void warning(ID id, ISourcePosition position, String message) {
      */
     @Override
     public void warning(ID id, String fileName, int lineNumber, String message) {
-        assert isVerbose();
-
-        if (!runtime.warningsEnabled()) return;
+        if (!runtime.warningsEnabled() || !runtime.isVerbose()) return;
 
         warn(id, fileName, lineNumber, message);
     }
@@ -181,7 +177,7 @@ public void warn(ID id, ISourcePosition position, String message, Object... data
     @Deprecated
     @Override
     public void warn(ID id, String fileName, int lineNumber, String message, Object... data) {
-        if (!runtime.warningsEnabled()) return; // TODO make an assert here
+        if (!runtime.warningsEnabled()) return;
 
         StringBuilder buffer = new StringBuilder(100);
 
@@ -219,7 +215,7 @@ public void warning(ID id, ISourcePosition position, String message, Object... d
     @Deprecated
     @Override
     public void warning(ID id, String fileName, int lineNumber, String message, Object... data) {
-        assert isVerbose(); 
+        if (!runtime.warningsEnabled() || !runtime.isVerbose()) return;
         warn(id, fileName, lineNumber, message, data);
     }
 }
diff --git a/core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java b/core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java
@@ -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) {