Skip to content

[Java] Fix skip negotiate null ref #30482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 10, 2021
Merged

[Java] Fix skip negotiate null ref #30482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ac4dc5
[Java] Fix skip negotiate null ref
BrennanConroy Feb 26, 2021
27db949
comment
BrennanConroy Feb 26, 2021
fb4b3cd
fixup
BrennanConroy Feb 26, 2021
953f233
minimize change
BrennanConroy Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,13 @@ public Completable start() {
Transport transport = customTransport;
if (transport == null) {
Single<String> tokenProvider = negotiateResponse.getAccessToken() != null ? Single.just(negotiateResponse.getAccessToken()) : accessTokenProvider;
switch (negotiateResponse.getChosenTransport()) {
TransportEnum chosenTransport;
if (this.skipNegotiate) {
chosenTransport = this.transportEnum;
} else {
chosenTransport = negotiateResponse.getChosenTransport();
}
switch (chosenTransport) {
case LONG_POLLING:
transport = new LongPollingTransport(localHeaders, httpClient, tokenProvider);
break;
Expand Down
31 changes: 31 additions & 0 deletions ...nalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2743,6 +2743,37 @@ public void noConnectionIdWhenSkippingNegotiate() {
assertNull(hubConnection.getConnectionId());
}

@Test
public void SkippingNegotiateDoesNotNegotiate() {
try (TestLogger logger = new TestLogger(WebSocketTransport.class.getName())) {
AtomicBoolean negotiateCalled = new AtomicBoolean(false);
TestHttpClient client = new TestHttpClient().on("POST", "http://example.com/negotiate?negotiateVersion=1",
(req) -> {
negotiateCalled.set(true);
return Single.just(new HttpResponse(200, "",
TestUtils.stringToByteBuffer("{\"connectionId\":\"bVOiRPG8-6YiJ6d7ZcTOVQ\",\""
+ "availableTransports\":[{\"transport\":\"WebSockets\",\"transferFormats\":[\"Text\",\"Binary\"]}]}")));
});

HubConnection hubConnection = HubConnectionBuilder
.create("http://example")
.withTransport(TransportEnum.WEBSOCKETS)
.shouldSkipNegotiate(true)
.withHttpClient(client)
.build();

try {
hubConnection.start().timeout(30, TimeUnit.SECONDS).blockingAwait();
} catch (Exception e) {
assertEquals("WebSockets isn't supported in testing currently.", e.getMessage());
}
assertEquals(HubConnectionState.DISCONNECTED, hubConnection.getConnectionState());
assertFalse(negotiateCalled.get());

logger.assertLog("Starting Websocket connection.");
}
}

@Test
public void connectionIdIsAvailableAfterStart() {
TestHttpClient client = new TestHttpClient().on("POST", "http://example.com/negotiate?negotiateVersion=1",
Expand Down