aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohan Embar <gnustuff@thisiscool.com>2003-12-04 00:31:27 +0000
committerMohan Embar <membar@gcc.gnu.org>2003-12-04 00:31:27 +0000
commit148c8e7b517c7b11d0176a80718cb96683a1e300 (patch)
tree803ac89610cb41c768756dfa932f47b3a98f0c77
parentda63064ac87e3a1deb958d37c4654fb5b09ab44a (diff)
downloadgcc-148c8e7b517c7b11d0176a80718cb96683a1e300.zip
gcc-148c8e7b517c7b11d0176a80718cb96683a1e300.tar.gz
gcc-148c8e7b517c7b11d0176a80718cb96683a1e300.tar.bz2
* gnu/java/nio/natSelectorImplPosix.cc
(implSelect): A timeout of 0 means an infinite timeout. From-SVN: r74259
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/gnu/java/nio/natSelectorImplPosix.cc6
2 files changed, 10 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b89faeb..3153305 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-03 Mohan Embar <gnustuff@thisiscool.com>
+
+ * gnu/java/nio/natSelectorImplPosix.cc
+ (implSelect): A timeout of 0 means an infinite
+ timeout.
+
2003-12-02 Fernando Nasser <fnasser@redhat.com>
* gnu/java/awt/peer/gtk/GtkListPeer.java (handleEvent): Fix generation
diff --git a/libjava/gnu/java/nio/natSelectorImplPosix.cc b/libjava/gnu/java/nio/natSelectorImplPosix.cc
index 8f1bb68..81de3ed 100644
--- a/libjava/gnu/java/nio/natSelectorImplPosix.cc
+++ b/libjava/gnu/java/nio/natSelectorImplPosix.cc
@@ -57,8 +57,10 @@ gnu::java::nio::SelectorImpl::implSelect (jintArray read, jintArray write,
real_time_data.tv_usec = timeout;
// If not legal timeout value is given, use NULL.
- // This means an infinite timeout.
- if (timeout >= 0)
+ // This means an infinite timeout. The specification
+ // also says that a zero timeout should be treated
+ // as infinite.
+ if (timeout > 0)
{
time_data = &real_time_data;
}