Merge remote-tracking branch 'origin/jruby-1_7'

Conflicts: core/src/main/java/org/jruby/RubyFile.java core/src/main/ruby/jruby/kernel/kernel.rb
jruby · Aug 18, 2015 · cfd7f74 · cfd7f74
2 parents 28137f5 + 964fbe4
commit cfd7f74
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/util/io/PosixShim.java b/core/src/main/java/org/jruby/util/io/PosixShim.java
@@ -173,7 +173,9 @@ public int flock(ChannelFD fd, int lockMode) {
 
         int real_fd = fd.realFileno;
 
-        if (real_fd != -1 && real_fd < FilenoUtil.FIRST_FAKE_FD) {
+        if (real_fd != -1 && real_fd < FilenoUtil.FIRST_FAKE_FD && !Platform.IS_SOLARIS) {
+            // we have a real fd and not on Solaris...try native flocking
+            // see jruby/jruby#3254 and jnr/jnr-posix#60
             int result = posix.flock(real_fd, lockMode);
             if (result < 0) {
                 errno = Errno.valueOf(posix.errno());