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

jruby · Dec 8, 2014 · 7363556 · 7363556
1 parent a4ead5a
commit 7363556
Showing 1 changed file with 6 additions and 3 deletions.
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));
     }