This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: PR 21136 for 4.0
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 29 Apr 2005 12:37:28 -0600
- Subject: Patch: FYI: PR 21136 for 4.0
- Reply-to: tromey at redhat dot com
I'm checking this in on the 4.0 branch.
This is the PR 21136 fix.
Tom
Index: ChangeLog
from Luca Barbieri <luca.barbieri@gmail.com>
PR libgcj/21136:
* gnu/java/nio/channels/FileChannelImpl.java (tryLock): Pass
'false' to native lock().
(lock): Pass 'true' to native lock().
Index: gnu/java/nio/channels/FileChannelImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/nio/channels/FileChannelImpl.java,v
retrieving revision 1.7.4.1
diff -u -r1.7.4.1 FileChannelImpl.java
--- gnu/java/nio/channels/FileChannelImpl.java 10 Mar 2005 16:09:35 -0000 1.7.4.1
+++ gnu/java/nio/channels/FileChannelImpl.java 29 Apr 2005 18:37:32 -0000
@@ -419,7 +419,7 @@
try
{
begin();
- lock(position, size, shared, true);
+ lock(position, size, shared, false);
completed = true;
return new FileLockImpl(this, position, size, shared);
}
@@ -451,7 +451,7 @@
try
{
- boolean lockable = lock(position, size, shared, false);
+ boolean lockable = lock(position, size, shared, true);
completed = true;
return (lockable
? new FileLockImpl(this, position, size, shared)