[dubbo] 01/01: Merge branch 'apache-3.1' into apache-3.2

[albumenj]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit e026b5bb596bbc48fa89bbf756cba504d52bed1d
Merge: 4778d131f8 f882cbdd80
Author: Albumen Kevin <jhq0...@gmail.com>
AuthorDate: Thu Jul 6 17:57:11 2023 +0800

    Merge branch 'apache-3.1' into apache-3.2
    
    # Conflicts:
    #       
dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/exchange/RequestTest.java

 .../src/main/java/org/apache/dubbo/remoting/exchange/Request.java     | 3 ++-
 .../src/test/java/org/apache/dubbo/remoting/exchange/RequestTest.java | 4 +++-
 .../src/main/java/org/apache/dubbo/common/serialize/ObjectInput.java  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --cc 
dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/exchange/RequestTest.java
index 138ffd8955,d358ffaa4c..ae1323e865
--- 
a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/exchange/RequestTest.java
+++ 
b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/exchange/RequestTest.java
@@@ -36,8 -37,7 +38,8 @@@ class RequestTest 
          Assertions.assertTrue(request.isEvent());
          Assertions.assertEquals(request.getVersion(), "1.0.0");
          Assertions.assertEquals(request.getData(), "data");
-         Assertions.assertTrue(request.getId() >= 0);
+         Assertions.assertEquals(requestStart.getId() + 1, request.getId());
 +        Assertions.assertEquals(1024, request.getPayload());
  
          request.setHeartbeat(true);
          Assertions.assertTrue(request.isHeartbeat());