summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEgidijus Vaishnora2011-09-19 07:00:54 (EDT)
committerEgidijus Vaishnora2011-09-19 07:00:54 (EDT)
commitfedcf33958a9cc9a035fccb525e1d9a0a2d7b20c (patch)
treecf6c0c84dd2a346ad874791021f49938f2cf959c
parent11193b6258e2265df573681d3266646384a4e41f (diff)
downloadcdo-fedcf33958a9cc9a035fccb525e1d9a0a2d7b20c.zip
cdo-fedcf33958a9cc9a035fccb525e1d9a0a2d7b20c.tar.gz
cdo-fedcf33958a9cc9a035fccb525e1d9a0a2d7b20c.tar.bz2
358088: ExpectedFileInputStream waits for all timeoutdrops/M20110923-0410
https://bugs.eclipse.org/bugs/show_bug.cgi?id=358088
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExpectedFileInputStream.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExpectedFileInputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExpectedFileInputStream.java
index 258330f..7bf7a8c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExpectedFileInputStream.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExpectedFileInputStream.java
@@ -104,7 +104,7 @@ public class ExpectedFileInputStream extends FileInputStream
try
{
- wait(Math.max(100L, restTime));
+ wait(Math.min(100L, restTime));
}
catch (InterruptedException ex)
{