From a2295b1c5cfa37ba98570b051e631dd799d3ffc3 Mon Sep 17 00:00:00 2001 From: tromey Date: Tue, 3 May 2005 22:38:17 +0000 Subject: 2005-05-03 Andrew Overholt 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 --- libjava/gnu/java/nio/channels/FileChannelImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libjava/gnu') 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 { -- cgit v1.2.3