You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2014/06/03 21:54:00 UTC
git commit: [SSHD-316] DefaultSshFuture may wait forevever
Repository: mina-sshd
Updated Branches:
refs/heads/master 1a84ede6b -> 6499aa9a6
[SSHD-316] DefaultSshFuture may wait forevever
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/6499aa9a
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/6499aa9a
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/6499aa9a
Branch: refs/heads/master
Commit: 6499aa9a68f5ba2448c9d88efc5049c01f287eb4
Parents: 1a84ede
Author: Guillaume Nodet <gn...@apache.org>
Authored: Tue Jun 3 21:53:49 2014 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Tue Jun 3 21:53:49 2014 +0200
----------------------------------------------------------------------
.../main/java/org/apache/sshd/common/future/DefaultSshFuture.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/6499aa9a/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java b/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java
index 479813f..95c299a 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java
@@ -140,7 +140,7 @@ public class DefaultSshFuture<T extends SshFuture> implements SshFuture<T> {
}
curTime = System.currentTimeMillis();
- if (ready || curTime > endTime) {
+ if (ready || curTime >= endTime) {
return ready;
}
}