diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-05-03 22:38:17 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-05-03 22:38:17 +0000 |
| commit | a2295b1c5cfa37ba98570b051e631dd799d3ffc3 (patch) | |
| tree | d6cc1093a809e003aab0e160015f13e1f04bca5f /libjava/gnu/java/nio/channels/FileChannelImpl.java | |
| parent | 0b25db2159a2082ba5b70c17bd8ca2800036e50c (diff) | |
| download | ppe42-gcc-a2295b1c5cfa37ba98570b051e631dd799d3ffc3.tar.gz ppe42-gcc-a2295b1c5cfa37ba98570b051e631dd799d3ffc3.zip | |
2005-05-03 Andrew Overholt <overholt@redhat.com>
PR libgcj/21372:
* gnu/java/nio/channels/FileChannelImpl.java: Return null if lock
could not be acquired.
* java/nio/channels/FileLock.java (toString): Re-implement to be
in line with other implementations.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@99188 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu/java/nio/channels/FileChannelImpl.java')
| -rw-r--r-- | libjava/gnu/java/nio/channels/FileChannelImpl.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libjava/gnu/java/nio/channels/FileChannelImpl.java b/libjava/gnu/java/nio/channels/FileChannelImpl.java index aaa4c260864..6893d817744 100644 --- a/libjava/gnu/java/nio/channels/FileChannelImpl.java +++ b/libjava/gnu/java/nio/channels/FileChannelImpl.java @@ -437,9 +437,11 @@ public final class FileChannelImpl extends FileChannel try { begin(); - lock(position, size, shared, false); + boolean lockable = lock(position, size, shared, false); completed = true; - return new FileLockImpl(this, position, size, shared); + return (lockable + ? new FileLockImpl(this, position, size, shared) + : null); } finally { |
