Commitbff695e

committed

Drop WebSocketUpgradeHandler:: touchSuccess

MotivationThis hack was a very old workaround forAsyncHttpClient#317 where the server wouldsend the first frame along with the handshake.This issue has actually been fixed for quite some time, we just had toreplace the `UpgradeCallback` with the future before triggering theread when upgrading the pipeline.We no longer need this protection as there’s no way the`UpgradeCallback` can be called twice.Modification:Remove dead code.Result:Clean code

1 parent7a70b80 commitbff695eCopy full SHA for bff695e

File tree

2 files changed

-12

lines changed

client/src/main/java/org/asynchttpclient
- netty/handler
  - WebSocketHandler.java
- ws
  - WebSocketUpgradeHandler.java

2 files changed

-12

lines changed

`‎client/src/main/java/org/asynchttpclient/netty/handler/WebSocketHandler.java‎`

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -73,12 +73,10 @@ public UpgradeCallback(NettyResponseFuture<?> future, Channel channel, HttpRespo`
`73`	`73`	`// We don't need to synchronize as replacing the "ws-decoder" will`
`74`	`74`	`// process using the same thread.`
`75`	`75`	`privatevoidinvokeOnSucces(Channelchannel,WebSocketUpgradeHandlerh) {`
`76`		`-if (!h.touchSuccess()) {`
`77`		`-try {`
`78`		`-h.onSuccess(newNettyWebSocket(channel,responseHeaders.getHeaders()));`
`79`		`- }catch (Exceptionex) {`
`80`		`-logger.warn("onSuccess unexpected exception",ex);`
`81`		`- }`
	`76`	`+try {`
	`77`	`+h.onSuccess(newNettyWebSocket(channel,responseHeaders.getHeaders()));`
	`78`	`+ }catch (Exceptionex) {`
	`79`	`+logger.warn("onSuccess unexpected exception",ex);`
`82`	`80`	`}`
`83`	`81`	`}`
`84`	`82`

`‎client/src/main/java/org/asynchttpclient/ws/WebSocketUpgradeHandler.java‎`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ public class WebSocketUpgradeHandler implements UpgradeHandler<WebSocket>, Async`
`33`	`33`	`privateWebSocketwebSocket;`
`34`	`34`	`privatefinalList<WebSocketListener>listeners;`
`35`	`35`	`privatefinalAtomicBooleanok =newAtomicBoolean(false);`
`36`		`-privatebooleanonSuccessCalled;`
`37`	`36`	`privateintstatus;`
`38`	`37`	`privateList<Runnable>bufferedFrames;`
`39`	`38`
`@@ -53,11 +52,6 @@ public final void onThrowable(Throwable t) {`
`53`	`52`	`onFailure(t);`
`54`	`53`	`}`
`55`	`54`
`56`		`-publicbooleantouchSuccess() {`
`57`		`-booleanprev =onSuccessCalled;`
`58`		`-onSuccessCalled =true;`
`59`		`-returnprev;`
`60`		`- }`
`61`	`55`
`62`	`56`	`@Override`
`63`	`57`	`publicfinalStateonBodyPartReceived(HttpResponseBodyPartbodyPart)throwsException {`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitbff695e

File tree

2 files changed

2 files changed

`‎client/src/main/java/org/asynchttpclient/netty/handler/WebSocketHandler.java‎`

`‎client/src/main/java/org/asynchttpclient/ws/WebSocketUpgradeHandler.java‎`

0 commit comments