diff options
| author | Michael Koch <konqueror@gmx.de> | 2003-09-25 19:22:32 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-09-25 19:22:32 +0000 |
| commit | bf172f5467cbd5313c1c59cab7308ea3ac6c2cec (patch) | |
| tree | 4fb749423d77ef2c56bb9aff93b21e728fa747b1 /libjava | |
| parent | 9481d818d93d9debcfaa45192a0c259fa7b70df4 (diff) | |
| download | gcc-bf172f5467cbd5313c1c59cab7308ea3ac6c2cec.zip gcc-bf172f5467cbd5313c1c59cab7308ea3ac6c2cec.tar.gz gcc-bf172f5467cbd5313c1c59cab7308ea3ac6c2cec.tar.bz2 | |
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.
From-SVN: r71792
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/gnu/java/net/PlainDatagramSocketImpl.java | 25 | ||||
| -rw-r--r-- | libjava/gnu/java/net/PlainSocketImpl.java | 5 |
3 files changed, 28 insertions, 10 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 143ec55..c924e07 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +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. + 2003-09-25 Ingo Proetel <proetel@aicas.com> * java/io/ObjectOutputStream.java: diff --git a/libjava/gnu/java/net/PlainDatagramSocketImpl.java b/libjava/gnu/java/net/PlainDatagramSocketImpl.java index a0785db..bc86864 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 3edb974..01ba288 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 |