Merged gcj-eclipse branch to trunk.

From-SVN: r120621
This commit is contained in:
Tom Tromey 2007-01-09 19:58:05 +00:00
parent c648dedbde
commit 97b8365caf
17478 changed files with 606493 additions and 100744 deletions

View file

@ -39,7 +39,7 @@ exception statement from your version. */
package java.io;
import gnu.java.nio.channels.FileChannelImpl;
import gnu.java.nio.FileChannelImpl;
import java.nio.channels.ByteChannel;
import java.nio.channels.FileChannel;
@ -133,7 +133,8 @@ public final class FileDescriptor
* native file handle, <code>false</code> otherwise
*/
public boolean valid ()
{
return channel != null && channel.isOpen();
{
ByteChannel c = channel;
return (c != null) && (c.isOpen());
}
}