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

1 files changed, 11 insertions, 1 deletions

diff --git a/libjava/java/nio/channels/FileLock.java b/libjava/java/nio/channels/FileLock.java
index 629f5ef79ec..a4af08091bb 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;
   }
 }