Skip to content

Commit 25002d5

Browse files
committed
Merge pull request AsyncHttpClient#832 from laszlohordos/1.8.x
Update Grizzly version
2 parents d13f648 + 107e89a commit 25002d5

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@
591591
<compiler.exclude>com/ning/http/client/providers/grizzly/*.java</compiler.exclude>
592592
<test.compiler.exclude>com/ning/http/client/async/grizzly/*.java</test.compiler.exclude>
593593
<javadoc.package.exclude>com.ning.http.client.providers.grizzly</javadoc.package.exclude>
594-
<grizzly.version>2.3.16</grizzly.version>
594+
<grizzly.version>2.3.19</grizzly.version>
595595
<source.property>1.5</source.property>
596596
<target.property>1.5</target.property>
597597
<surefire.version>2.12</surefire.version>

src/main/java/com/ning/http/client/providers/grizzly/FeedableBodyGenerator.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,10 @@ public void onComplete(Connection connection) {
225225
}
226226
}
227227
}
228+
229+
public void onFailure(Connection connection, Throwable t) {
230+
231+
}
228232
});
229233
filter.handshake(context.getConnection(), null);
230234
}

src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,7 @@ private boolean sendAsGrizzlyRequest(final Request request,
932932
final URI wsURI = new URI(httpCtx.wsRequestURI);
933933
secure = "wss".equalsIgnoreCase(wsURI.getScheme());
934934
httpCtx.protocolHandler = Version.RFC6455.createHandler(true);
935-
httpCtx.handshake = httpCtx.protocolHandler.createHandShake(wsURI);
935+
httpCtx.handshake = httpCtx.protocolHandler.createClientHandShake(wsURI);
936936
requestPacket = (HttpRequestPacket) httpCtx.handshake.composeHeaders().getHttpHeader();
937937
} catch (URISyntaxException e) {
938938
throw new IllegalArgumentException("Invalid WS URI: " + httpCtx.wsRequestURI);

0 commit comments

Comments
 (0)