Solaris does not have flock, so use Java logic. Fixes #3254.

jruby · Aug 18, 2015 · 964fbe4 · 964fbe4
1 parent eb94ae0
commit 964fbe4
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/RubyFile.java b/core/src/main/java/org/jruby/RubyFile.java
@@ -263,12 +263,13 @@ public IRubyObject flock(ThreadContext context, IRubyObject lockingConstant) {
         int lockMode = RubyNumeric.num2int(lockingConstant);
 
         Channel channel = descriptor.getChannel();
-        
+
         FileDescriptor fd = ChannelDescriptor.getDescriptorFromChannel(channel);
         int real_fd = JavaLibCHelper.getfdFromDescriptor(fd);
 
-        if (real_fd != -1) {
-            // we have a real fd...try native flocking
+        if (real_fd != -1 && !Platform.IS_SOLARIS) {
+            // we have a real fd and not on Solaris...try native flocking
+            // see jruby/jruby#3254 and jnr/jnr-posix#60
             try {
                 int result = runtime.getPosix().flock(real_fd, lockMode);
                 if (result < 0) {