From bf172f5467cbd5313c1c59cab7308ea3ac6c2cec Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Thu, 25 Sep 2003 19:22:32 +0000 Subject: [PATCH] 2003-09-25 Michael Koch * gnu/java/net/PlainDatagramSocketImpl.java (finalize): Moved to directly after constructor. (getNativeFD): New method. * gnu/java/net/PlainSocketImpl.java (getNativeFD): New method. From-SVN: r71792 --- libjava/ChangeLog | 8 ++++++ .../gnu/java/net/PlainDatagramSocketImpl.java | 25 +++++++++++-------- libjava/gnu/java/net/PlainSocketImpl.java | 5 ++++ 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 143ec550b4a..c924e075724 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2003-09-25 Michael Koch + + * gnu/java/net/PlainDatagramSocketImpl.java + (finalize): Moved to directly after constructor. + (getNativeFD): New method. + * gnu/java/net/PlainSocketImpl.java + (getNativeFD): New method. + 2003-09-25 Ingo Proetel * java/io/ObjectOutputStream.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 -- 2.30.2