From 97b8365cafc3a344a22d3980b8ed885f5c6d8357 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@gcc.gnu.org>
Date: Tue, 9 Jan 2007 19:58:05 +0000
Subject: Merged gcj-eclipse branch to trunk.

From-SVN: r120621
---
 libjava/classpath/java/io/FileDescriptor.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'libjava/classpath/java/io/FileDescriptor.java')

diff --git a/libjava/classpath/java/io/FileDescriptor.java b/libjava/classpath/java/io/FileDescriptor.java
index d300c9cb617..cf9ff20d564 100644
--- a/libjava/classpath/java/io/FileDescriptor.java
+++ b/libjava/classpath/java/io/FileDescriptor.java
@@ -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());
   }
 }
-- 
cgit v1.2.3