diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-12 19:15:27 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-12 19:15:27 +0000 |
| commit | 9bb06fc7fd7c58cc57cf084b8436cac71b99071f (patch) | |
| tree | a74e9b7a3d337de58e31ea8e168feb672a001e1a /libjava/gnu/java | |
| parent | 8a54e13f9ebd07204272238a96fa566eb1c49c94 (diff) | |
| download | ppe42-gcc-9bb06fc7fd7c58cc57cf084b8436cac71b99071f.tar.gz ppe42-gcc-9bb06fc7fd7c58cc57cf084b8436cac71b99071f.zip | |
2004-11-11 Casey Marshall <csm@gnu.org>
* 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
Diffstat (limited to 'libjava/gnu/java')
| -rw-r--r-- | libjava/gnu/java/nio/FileLockImpl.java | 2 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/channels/natFileChannelPosix.cc | 2 |
2 files changed, 2 insertions, 2 deletions
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; |
