Merged gcj-eclipse branch to trunk.

From-SVN: r120621
2007-01-09 19:58:05 +00:00 · 2007-01-09 19:58:05 +00:00 · 97b8365caf
commit 97b8365caf
parent c648dedbde
17478 changed files with 606493 additions and 100744 deletions
--- a/libjava/classpath/gnu/java/nio/SocketChannelSelectionKeyImpl.java
+++ b/libjava/classpath/gnu/java/nio/SocketChannelSelectionKeyImpl.java
@ -38,6 +38,8 @@ exception statement from your version. */

 package gnu.java.nio;

+import java.io.IOException;
+

 /**
 * @author Michael Barker <mike@middlesoft.co.uk>
@ -63,7 +65,14 @@ public class SocketChannelSelectionKeyImpl extends SelectionKeyImpl
   */
  public int getNativeFD()
  {
-    return ch.getPlainSocketImpl().getNativeFD();
+    try
+      {
+        return ch.getVMChannel().getState().getNativeFD();
+      }
+    catch (IOException ioe)
+      {
+        return 0; // FIXME
+      }
  }

 }