diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-10-21 12:29:43 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-10-21 12:29:43 +0000 |
| commit | 0faafccedafccbd234e68a301e020e860ee155aa (patch) | |
| tree | 7c76fd763fe70176e08b712fa4d52f9769f72f4d /libjava/gnu/java/net/PlainSocketImpl.java | |
| parent | 842bc5408aaa6d4647db58abfd6b71aff077d188 (diff) | |
| download | ppe42-gcc-0faafccedafccbd234e68a301e020e860ee155aa.tar.gz ppe42-gcc-0faafccedafccbd234e68a301e020e860ee155aa.zip | |
2003-10-21 Michael Koch <konqueror@gmx.de>
* gnu/java/net/PlainDatagramSocketImpl.java,
gnu/java/net/PlainSocketImpl.java,
gnu/java/net/natPlainDatagramSocketImplPosix.cc,
gnu/java/net/natPlainDatagramSocketImplWin32.cc,
gnu/java/net/natPlainSocketImplPosix.cc,
gnu/java/net/natPlainSocketImplWin32.cc:
Renamed fnum to native_fd to match classpath more.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72746 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu/java/net/PlainSocketImpl.java')
| -rw-r--r-- | libjava/gnu/java/net/PlainSocketImpl.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libjava/gnu/java/net/PlainSocketImpl.java b/libjava/gnu/java/net/PlainSocketImpl.java index 01ba28851d7..80139115cfe 100644 --- a/libjava/gnu/java/net/PlainSocketImpl.java +++ b/libjava/gnu/java/net/PlainSocketImpl.java @@ -1,5 +1,6 @@ /* PlainSocketImpl.java -- Default socket implementation - Copyright (C) 1998, 1999, 2003 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -100,7 +101,7 @@ public final class PlainSocketImpl extends SocketImpl * * When the socket is closed this is reset to -1. */ - int fnum = -1; + int native_fd = -1; // This value is set/read by setOption/getOption. int timeout = 0; @@ -129,14 +130,13 @@ public final class PlainSocketImpl extends SocketImpl { synchronized (this) { - if (fnum != -1) + if (native_fd != -1) try { close(); } catch (IOException ex) { - // ignore } } super.finalize(); @@ -144,7 +144,7 @@ public final class PlainSocketImpl extends SocketImpl public int getNativeFD() { - return fnum; + return native_fd; } /** |
