From 4e511a2b61cadec7edb503d9305bf557c972b57b Mon Sep 17 00:00:00 2001
From: mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 25 Sep 2003 19:22:32 +0000
Subject: 2003-09-25  Michael Koch  <konqueror@gmx.de>

	* gnu/java/net/PlainDatagramSocketImpl.java
	(finalize): Moved to directly after constructor.
	(getNativeFD): New method.
	* gnu/java/net/PlainSocketImpl.java
	(getNativeFD): New method.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71792 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/gnu/java/net/PlainDatagramSocketImpl.java | 25 ++++++++++++++---------
 libjava/gnu/java/net/PlainSocketImpl.java         |  5 +++++
 2 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'libjava/gnu/java')

diff --git a/libjava/gnu/java/net/PlainDatagramSocketImpl.java b/libjava/gnu/java/net/PlainDatagramSocketImpl.java
index a0785dbc303..bc868644e40 100644
--- a/libjava/gnu/java/net/PlainDatagramSocketImpl.java
+++ b/libjava/gnu/java/net/PlainDatagramSocketImpl.java
@@ -112,6 +112,21 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl
   {
   }
 
+  protected void finalize() throws Throwable
+  {
+    synchronized (this)
+      {
+	if (fnum != -1)
+	  close();
+      }
+    super.finalize();
+  }
+
+  public int getNativeFD()
+  {
+    return fnum;
+  }
+
   /**
    * Binds this socket to a particular port and interface
    *
@@ -267,14 +282,4 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl
   {
     mcastGrp(((InetSocketAddress)mcastaddr).getAddress(), netIf, false);
   }
-
-  protected void finalize() throws Throwable
-  {
-    synchronized (this)
-      {
-	if (fnum != -1)
-	  close();
-      }
-    super.finalize();
-  }
 }
diff --git a/libjava/gnu/java/net/PlainSocketImpl.java b/libjava/gnu/java/net/PlainSocketImpl.java
index 3edb9745bed..01ba28851d7 100644
--- a/libjava/gnu/java/net/PlainSocketImpl.java
+++ b/libjava/gnu/java/net/PlainSocketImpl.java
@@ -142,6 +142,11 @@ public final class PlainSocketImpl extends SocketImpl
     super.finalize();
   }
 
+  public int getNativeFD()
+  {
+    return fnum;
+  }
+
   /**
    * Sets the specified option on a socket to the passed in object.  For
    * options that take an integer argument, the passed in object is an
-- 
cgit v1.2.3