This is an automated email from the ASF dual-hosted git repository.
youling1128 pushed a commit to branch 2.9.x
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/2.9.x by this push:
new d4a3fb1f7 [#5058] Upgrade the Netty, Vertx version. (#5059)
d4a3fb1f7 is described below
commit d4a3fb1f707f30b730ad5513eb50b6be13d4fd55
Author: Alex <[email protected]>
AuthorDate: Wed Jan 28 15:58:44 2026 +0800
[#5058] Upgrade the Netty, Vertx version. (#5059)
---
demo/docker-build-config/pom.xml | 2 +-
dependencies/default/pom.xml | 4 ++--
.../apache/servicecomb/foundation/vertx/stream/BufferInputStream.java | 4 ++++
.../servicecomb/foundation/vertx/stream/TestBufferInputStream.java | 4 +++-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/demo/docker-build-config/pom.xml b/demo/docker-build-config/pom.xml
index 919a661f8..0fea43d19 100644
--- a/demo/docker-build-config/pom.xml
+++ b/demo/docker-build-config/pom.xml
@@ -42,7 +42,7 @@
<name>${project.artifactId}:${project.version}</name>
<alias>${project.artifactId}</alias>
<build>
- <from>openjdk:21</from>
+ <from>openjdk:17.0.2</from>
<ports>
<port>7070</port>
<port>8080</port>
diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml
index e2fb35997..68cdcf8c6 100644
--- a/dependencies/default/pom.xml
+++ b/dependencies/default/pom.xml
@@ -77,7 +77,7 @@
<mock-server.version>5.14.0</mock-server.version>
<nacos-client.version>2.2.0</nacos-client.version>
<netflix-commons.version>0.3.0</netflix-commons.version>
- <netty.version>4.1.127.Final</netty.version>
+ <netty.version>4.1.130.Final</netty.version>
<okhttp3.version>4.10.0</okhttp3.version>
<prometheus.version>0.16.0</prometheus.version>
<protobuf.version>3.21.12</protobuf.version>
@@ -97,7 +97,7 @@
<spring-boot.version>3.4.9</spring-boot.version>
<swagger.version>1.6.9</swagger.version>
<swagger2markup.version>1.3.3</swagger2markup.version>
- <vertx.version>4.5.21</vertx.version>
+ <vertx.version>4.5.23</vertx.version>
<zipkin.version>3.4.3</zipkin.version>
<zipkin-reporter.version>3.4.0</zipkin-reporter.version>
<jakarta.validation.version>3.0.2</jakarta.validation.version>
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 af9af15e0..5c78048a8 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 class BufferInputStream extends ServletInputStream {
@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 070fe207d..1d219ce1a 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 class TestBufferInputStream {
@Test
public void testRead() {
- Assertions.assertEquals(0, instance.read());
+ ByteBuf buffer = Unpooled.buffer();
+ BufferInputStream bIn = new BufferInputStream(buffer);
+ Assertions.assertEquals(-1, bIn.read());
}
@Test
