mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-26 12:23:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

re PR libgcj/21372 (FileChannel.tryLock() return value incorrect)

Browse Source 
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.

From-SVN: r99188
This commit is contained in:
Andrew Overholt 2005-05-03 22:38:17 +00:00 committed by Tom Tromey
parent 8148fe656d
commit f525d7a75f
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libjava/ChangeLog
View File

@ -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

6
libjava/gnu/java/nio/channels/FileChannelImpl.java
View File

@ -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
{

12
libjava/java/nio/channels/FileLock.java
View File

@ -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;
}
}