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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index dc025440acc13a17ad64ffa1878b1e445e1c350a..17a07fddfdde4e12d68b5e85308df0c702c51c11 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 2005-05-03  Tom Tromey  <tromey@redhat.com>
 
        * java/lang/VMSecurityManager.java (currentClassLoader): Use

diff --git a/libjava/gnu/java/nio/channels/FileChannelImpl.java b/libjava/gnu/java/nio/channels/FileChannelImpl.java
index aaa4c26086474d5f695a356e685b06f80abac53d..6893d817744c8c5153e4b5e45c2cf1268b49ca30 100644 (file)
--- 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
       {

diff --git a/libjava/java/nio/channels/FileLock.java b/libjava/java/nio/channels/FileLock.java
index 629f5ef79ec8aa513c934d8df729f13ad974236e..a4af08091bb3fe51a6e145580ceb116afc662107 100644 (file)
--- 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;
   }
 }