huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure SignalR client messages are processed in order (#7697)

This commit is contained in:
Mikael Mengistu 2019-02-19 11:48:22 -08:00 committed by GitHub
parent ded53315d8
commit d1fac57734
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/LongPollingTransport.java
View File

@ -98,7 +98,7 @@ class LongPollingTransport implements Transport {
} else { } else {
if (response.getContent() != null) { if (response.getContent() != null) {
logger.debug("Message received."); logger.debug("Message received.");
threadPool.execute(() -> this.onReceive(response.getContent())); this.onReceive(response.getContent());
} else { } else {
logger.debug("Poll timed out, reissuing."); logger.debug("Poll timed out, reissuing.");
} }

7
src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/LongPollingTransportTest.java
View File

@ -172,6 +172,9 @@ public class LongPollingTransportTest {
} else if (requestCount.get() == 2) { } else if (requestCount.get() == 2) {
requestCount.incrementAndGet(); requestCount.incrementAndGet();
return Single.just(new HttpResponse(200, "", "SECOND")); return Single.just(new HttpResponse(200, "", "SECOND"));
} else if (requestCount.get() == 3) {
requestCount.incrementAndGet();
return Single.just(new HttpResponse(200, "", "THIRD"));
} }
return Single.just(new HttpResponse(204, "", "")); return Single.just(new HttpResponse(204, "", ""));
@ -186,7 +189,7 @@ public class LongPollingTransportTest {
transport.setOnReceive((msg) -> { transport.setOnReceive((msg) -> {
onReceiveCalled.set(true); onReceiveCalled.set(true);
message.set(message.get() + msg); message.set(message.get() + msg);
if (messageCount.incrementAndGet() == 2) { if (messageCount.incrementAndGet() == 3) {
blocker.onComplete(); blocker.onComplete();
} }
}); });
@ -196,7 +199,7 @@ public class LongPollingTransportTest {
transport.start("http://example.com").timeout(1, TimeUnit.SECONDS).blockingAwait(); transport.start("http://example.com").timeout(1, TimeUnit.SECONDS).blockingAwait();
assertTrue(blocker.blockingAwait(1, TimeUnit.SECONDS)); assertTrue(blocker.blockingAwait(1, TimeUnit.SECONDS));
assertTrue(onReceiveCalled.get()); assertTrue(onReceiveCalled.get());
assertEquals("FIRSTSECOND", message.get()); assertEquals("FIRSTSECONDTHIRD", message.get());
} }
@Test @Test