procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Imported Classpath 0.18.

Browse source 
* sources.am, Makefile.in: Updated.
	* Makefile.am (nat_source_files): Removed natProxy.cc.
	* java/lang/reflect/natProxy.cc: Removed.
	* gnu/classpath/jdwp/VMFrame.java,
	gnu/classpath/jdwp/VMIdManager.java,
	gnu/classpath/jdwp/VMVirtualMachine.java,
	java/lang/reflect/VMProxy.java: New files.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* scripts/makemake.tcl (verbose): Add gnu/java/awt/peer/qt to BC
	list.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/net/DefaultContentHandlerFactory.java (getContent):
	Remove ClasspathToolkit references.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/awt/xlib/XCanvasPeer.java: Add new peer methods.
	* gnu/awt/xlib/XFramePeer.java: Likewise.
	* gnu/awt/xlib/XGraphicsConfiguration.java: Likewise.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* Makefile.am (libgcjawt_la_SOURCES): Remove jawt.c.  Add
	classpath/native/jawt/jawt.c.
	* Makefile.in: Regenerate.
	* jawt.c: Remove file.
	* include/Makefile.am (tool_include__HEADERS): Remove jawt.h and
	jawt_md.h.  Add ../classpath/include/jawt.h and
	../classpath/include/jawt_md.h.
	* include/Makefile.in: Regenerate.
	* include/jawt.h: Regenerate.
	* include/jawt_md.h: Regenerate.

From-SVN: r104586
This commit is contained in:
Tom Tromey 2005-09-23 21:31:04 +00:00
parent 9b044d1951
commit 1ea63ef8be
544 changed files with 34724 additions and 14512 deletions
Download patch file Download diff file Expand all files Collapse all files

42
libjava/classpath/gnu/java/nio/FileLockImpl.java
View file

@ -1,5 +1,5 @@
/* FileLockImpl.java --
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
/* FileLockImpl.java -- FileLock associated with a FileChannelImpl.
Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -44,20 +44,29 @@ import java.io.IOException;
import java.nio.channels.FileLock;
/**
* A FileLock associated with a FileChannelImpl.
*
* @author Michael Koch
* @since 1.4
*/
public class FileLockImpl extends FileLock
public final class FileLockImpl extends FileLock
{
private FileChannelImpl ch;
/**
* Whether or not this lock is valid, false when channel is closed or
* release has been explicitly called.
*/
private boolean valid;
public FileLockImpl (FileChannelImpl channel, long position,
long size, boolean shared)
{
super (channel, position, size, shared);
ch = channel;
valid = true;
}
/**
* Releases this lock.
*/
protected void finalize()
{
try
@ -70,13 +79,26 @@ public class FileLockImpl extends FileLock
}
}
public boolean isValid ()
/**
* Whether or not this lock is valid, false when channel is closed or
* release has been explicitly called.
*/
public boolean isValid()
{
return channel().isOpen();
if (valid)
valid = channel().isOpen();
return valid;
}
public synchronized void release () throws IOException
/**
* Releases the lock if it is still valid. Marks this lock as invalid.
*/
public void release() throws IOException
{
ch.unlock(position(), size());
if (isValid())
{
valid = false;
((FileChannelImpl) channel()).unlock(position(), size());
}
}
}