vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-25 13:32:07 +01:00
Code Issues Releases Wiki Activity

Fix deadline check

Browse source 
The pattern

if (now > deadline) break;
wait(deadline - now);

is insufficient in case "now == deadline" because the result would be
wait() being called with 0, which would mean "wait until
notified". Thus, the timeout would become infinite.
This commit is contained in:
Florian Schmaus 2016-12-19 15:13:05 +01:00
parent cfe5c2233d
commit 8511a9e67b
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
View file

@ -185,7 +185,7 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection {
final long deadline = System.currentTimeMillis() + getPacketReplyTimeout(); final long deadline = System.currentTimeMillis() + getPacketReplyTimeout();
while (!notified) { while (!notified) {
final long now = System.currentTimeMillis(); final long now = System.currentTimeMillis();
if (now > deadline) break; if (now >= deadline) break;
wait(deadline - now); wait(deadline - now);
} }
} }

2
smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java
View file

@ -203,7 +203,7 @@ public final class SASLAuthentication {
final long deadline = System.currentTimeMillis() + connection.getPacketReplyTimeout(); final long deadline = System.currentTimeMillis() + connection.getPacketReplyTimeout();
while (!authenticationSuccessful && saslException == null) { while (!authenticationSuccessful && saslException == null) {
final long now = System.currentTimeMillis(); final long now = System.currentTimeMillis();
if (now > deadline) break; if (now >= deadline) break;
// Wait until SASL negotiation finishes // Wait until SASL negotiation finishes
wait(deadline - now); wait(deadline - now);
} }

2
smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/util/ResultSyncPoint.java
View file

@ -36,7 +36,7 @@ public class ResultSyncPoint<R, E extends Exception> {
final long deadline = System.currentTimeMillis() + timeout; final long deadline = System.currentTimeMillis() + timeout;
while (result == null && exception == null) { while (result == null && exception == null) {
final long now = System.currentTimeMillis(); final long now = System.currentTimeMillis();
if (now > deadline) break; if (now >= deadline) break;
wait(deadline - now); wait(deadline - now);
} }
} }