Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-13 03:12:06 +01:00
Code Issues Releases Wiki Activity

First check condition, then remaining wait in SynchronizationPoint

Browse source 
as otherwhise SynchronizationPoint may report NoResponseException when
there was in fact a success or failure reported in case there are
multiple threads waiting for the condition.
This commit is contained in:
Florian Schmaus 2015-04-06 21:18:59 +02:00
parent 83aa6838d9
commit cca34fd872
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
smack-core/src/main/java/org/jivesoftware/smack/SynchronizationPoint.java
View file

@ -221,12 +221,11 @@ public class SynchronizationPoint<E extends Exception> {
long remainingWait = TimeUnit.MILLISECONDS.toNanos(connection.getPacketReplyTimeout()); long remainingWait = TimeUnit.MILLISECONDS.toNanos(connection.getPacketReplyTimeout());
while (state == State.RequestSent || state == State.Initial) { while (state == State.RequestSent || state == State.Initial) {
try { try {
remainingWait = condition.awaitNanos(
remainingWait);
if (remainingWait <= 0) { if (remainingWait <= 0) {
state = State.NoResponse; state = State.NoResponse;
break; break;
} }
remainingWait = condition.awaitNanos(remainingWait);
} catch (InterruptedException e) { } catch (InterruptedException e) {
LOGGER.log(Level.WARNING, "Thread interrupt while waiting for condition or timeout ignored", e); LOGGER.log(Level.WARNING, "Thread interrupt while waiting for condition or timeout ignored", e);
} }