diff --git a/demo/docker-build-config/pom.xml b/demo/docker-build-config/pom.xml index 919a661f898..0fea43d196e 100644 --- a/demo/docker-build-config/pom.xml +++ b/demo/docker-build-config/pom.xml @@ -42,7 +42,7 @@ ${project.artifactId}:${project.version} ${project.artifactId} - openjdk:21 + openjdk:17.0.2 7070 8080 diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index e2fb3599743..68cdcf8c6da 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -77,7 +77,7 @@ 5.14.0 2.2.0 0.3.0 - 4.1.127.Final + 4.1.130.Final 4.10.0 0.16.0 3.21.12 @@ -97,7 +97,7 @@ 3.4.9 1.6.9 1.3.3 - 4.5.21 + 4.5.23 3.4.3 3.4.0 3.0.2 diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java index af9af15e000..5c78048a824 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java @@ -45,6 +45,10 @@ public byte readByte() { @Override public int read() { + int avail = available(); + if (avail <= 0) { + return -1; + } return byteBuf.readUnsignedByte(); } diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java index 070fe207d6d..1d219ce1a08 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java @@ -49,7 +49,9 @@ public void tearDown() throws Exception { @Test public void testRead() { - Assertions.assertEquals(0, instance.read()); + ByteBuf buffer = Unpooled.buffer(); + BufferInputStream bIn = new BufferInputStream(buffer); + Assertions.assertEquals(-1, bIn.read()); } @Test