jlengrand/vert.x
1
0
Fork 0
mirror of https://github.com/jlengrand/vert.x.git synced 2026-03-10 08:51:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

A few necessary fixes

Browse Source
This commit is contained in:
Julien Viet
2019-12-04 00:47:32 +01:00
parent 159c34c2eb
commit 9967fff86b
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/io/vertx/core/http/impl/Http1xConnectionBase.java
View File

@@ -19,7 +19,7 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPromise;
import io.netty.channel.FileRegion;
import io.netty.handler.codec.http.HttpContent;
import io.netty.handler.codec.http.HttpMessage;
import io.netty.handler.codec.http.HttpObject;
import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
import io.netty.handler.codec.http.websocketx.ContinuationWebSocketFrame;
@@ -240,7 +240,7 @@ abstract class Http1xConnectionBase<S extends WebSocketImplBase<S>> extends Conn
@Override
protected void reportsBytesWritten(Object msg) {
if (msg instanceof HttpMessage) {
if (msg instanceof HttpObject) {
bytesWritten += getBytes(msg);
} else if (msg instanceof WebSocketFrame) {
// Only report WebSocket messages since HttpMessage are reported by streams

3
src/test/java/io/vertx/core/http/Http2ServerTest.java
View File

@@ -250,7 +250,8 @@ public class Http2ServerTest extends Http2TestBase {
waitFor(2);
Context ctx = vertx.getOrCreateContext();
server.connectionHandler(conn -> {
assertOnIOContext(ctx);
assertTrue(Context.isOnEventLoopThread());
assertSameEventLoop(vertx.getOrCreateContext(), ctx);
complete();
});
server.requestHandler(req -> fail());

10
src/test/java/io/vertx/core/spi/metrics/MetricsContextTest.java
View File

@@ -82,6 +82,7 @@ public class MetricsContextTest extends VertxTestBase {
}
private void testHttpServerRequest(Function<Vertx, Context> contextFactory) throws Exception {
waitFor(2);
AtomicReference<Thread> expectedThread = new AtomicReference<>();
AtomicReference<Context> expectedContext = new AtomicReference<>();
AtomicBoolean requestBeginCalled = new AtomicBoolean();
@@ -151,8 +152,8 @@ public class MetricsContextTest extends VertxTestBase {
});
awaitLatch(latch);
HttpClient client = vertx.createHttpClient();
client.put(8080, "localhost", "/", onSuccess(resp -> {
resp.request().connection().closeHandler(v -> {
client.connectionHandler(conn -> {
conn.closeHandler(v -> {
vertx.close(v4 -> {
assertTrue(requestBeginCalled.get());
assertTrue(responseEndCalled.get());
@@ -161,9 +162,12 @@ public class MetricsContextTest extends VertxTestBase {
assertTrue(socketConnectedCalled.get());
assertTrue(socketDisconnectedCalled.get());
assertTrue(closeCalled.get());
testComplete();
complete();
});
});
});
client.put(8080, "localhost", "/", onSuccess(resp -> {
complete();
})).exceptionHandler(err -> {
fail(err.getMessage());
}).setChunked(true).end(Buffer.buffer("hello"));