From 9bb06fc7fd7c58cc57cf084b8436cac71b99071f Mon Sep 17 00:00:00 2001 From: bryce Date: Fri, 12 Nov 2004 19:15:27 +0000 Subject: 2004-11-11 Casey Marshall * gnu/java/nio/FileLock.java (isValid): locks are valid if the channel is open. * gnu/java/nio/channels/natFileChannelPosix.cc (lock): use 'F_RDLCK' for shared locks, 'F_WRLCK' for exclusive locks. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90538 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/java/nio/FileLockImpl.java | 2 +- libjava/gnu/java/nio/channels/natFileChannelPosix.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libjava/gnu/java') diff --git a/libjava/gnu/java/nio/FileLockImpl.java b/libjava/gnu/java/nio/FileLockImpl.java index bba5880e22c..8591dac43b8 100644 --- a/libjava/gnu/java/nio/FileLockImpl.java +++ b/libjava/gnu/java/nio/FileLockImpl.java @@ -72,7 +72,7 @@ public class FileLockImpl extends FileLock public boolean isValid () { - return !channel().isOpen(); + return channel().isOpen(); } public synchronized void release () throws IOException diff --git a/libjava/gnu/java/nio/channels/natFileChannelPosix.cc b/libjava/gnu/java/nio/channels/natFileChannelPosix.cc index edc843b903a..742201bde94 100644 --- a/libjava/gnu/java/nio/channels/natFileChannelPosix.cc +++ b/libjava/gnu/java/nio/channels/natFileChannelPosix.cc @@ -457,7 +457,7 @@ FileChannelImpl::lock { struct flock lockdata; - lockdata.l_type = shared ? F_WRLCK : F_RDLCK; + lockdata.l_type = shared ? F_RDLCK : F_WRLCK; lockdata.l_whence = SEEK_SET; lockdata.l_start = pos; lockdata.l_len = len; -- cgit v1.2.3