From f525d7a75ffa9e02d094828e91b2c8af49272e61 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 3 May 2005 22:38:17 +0000 Subject: re PR libgcj/21372 (FileChannel.tryLock() return value incorrect) 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. From-SVN: r99188 --- libjava/java/nio/channels/FileLock.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'libjava/java/nio/channels/FileLock.java') diff --git a/libjava/java/nio/channels/FileLock.java b/libjava/java/nio/channels/FileLock.java index 629f5ef..a4af080 100644 --- a/libjava/java/nio/channels/FileLock.java +++ b/libjava/java/nio/channels/FileLock.java @@ -132,6 +132,16 @@ public abstract class FileLock */ public final String toString() { - return "file-lock:pos=" + position + "size=" + size; + String toReturn = getClass().getName() + + "[" + position + ":" + size; + if (shared) + toReturn += " shared"; + else + toReturn += " exclusive"; + if (isValid()) + toReturn += " valid]"; + else + toReturn += " invalid]"; + return toReturn; } } -- cgit v1.1