Commit916b8aa

committed

Drop UPGRADE State,closeAsyncHttpClient#1347

Motivation:The UPGRADE State is only returned by `WebSocketUpgradeHandler::onStatusReceived` which is internal and that can only return 2 values,so it could return CONTINUE instead.Modifications:* Drop UPGRADE* Use CONTINUE insteadResult:More simple code

1 parent97bc355 commit916b8aaCopy full SHA for 916b8aa

File tree

3 files changed

-7

lines changed

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

3 files changed

-7

lines changed

`‎client/src/main/java/org/asynchttpclient/AsyncHandler.java‎`

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,7 @@ enum State {`
`58`	`58`	`/**`
`59`	`59`	`* Continue the processing`
`60`	`60`	`*/`
`61`		`-CONTINUE,`
`62`		`-/**`
`63`		`- * Upgrade the protocol.`
`64`		`- */`
`65`		`-UPGRADE`
	`61`	`+CONTINUE`
`66`	`62`	`}`
`67`	`63`
`68`	`64`	`/**`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public void call() throws Exception {`
`90`	`90`	`if (connection ==null)`
`91`	`91`	`connection =response.headers().get(CONNECTION);`
`92`	`92`	`booleanvalidConnection =HttpHeaderValues.UPGRADE.contentEqualsIgnoreCase(connection);`
`93`		`-booleanstatusReceived =handler.onStatusReceived(status) ==State.UPGRADE;`
	`93`	`+booleanstatusReceived =handler.onStatusReceived(status) ==State.CONTINUE;`
`94`	`94`
`95`	`95`	`if (!statusReceived) {`
`96`	`96`	`try {`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public final State onBodyPartReceived(HttpResponseBodyPart bodyPart) throws Exce`
`67`	`67`	`@Override`
`68`	`68`	`publicfinalStateonStatusReceived(HttpResponseStatusresponseStatus)throwsException {`
`69`	`69`	`status =responseStatus.getStatusCode();`
`70`		`-returnstatus ==SWITCHING_PROTOCOLS ?State.UPGRADE :State.ABORT;`
	`70`	`+returnstatus ==SWITCHING_PROTOCOLS ?State.CONTINUE :State.ABORT;`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`@Override`

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!

Commit916b8aa

File tree

3 files changed

3 files changed

`‎client/src/main/java/org/asynchttpclient/AsyncHandler.java‎`

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

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

0 commit comments