fix bug: avoid npe when encode request

apache · Nov 30, 2020 · f4b66c1 · f4b66c1
1 parent 3fc2d10
commit f4b66c1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Request.java b/...remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Request.java
@@ -127,6 +127,16 @@ public void setHeartbeat(boolean isHeartbeat) {
         }
     }
 
+    public Request copy() {
+        Request copy = new Request(mId);
+        copy.mVersion = this.mVersion;
+        copy.mTwoWay = this.mTwoWay;
+        copy.mEvent = this.mEvent;
+        copy.mBroken = this.mBroken;
+        copy.mData = this.mData;
+        return copy;
+    }
+
     @Override
     public String toString() {
         return "Request [id=" + mId + ", version=" + mVersion + ", twoway=" + mTwoWay + ", event=" + mEvent

diff --git a/...-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/DefaultFuture.java b/...-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/DefaultFuture.java
@@ -261,7 +261,7 @@ private String getTimeoutMessage(boolean scan) {
     }
 
     private Request getRequestWithoutData() {
-        Request newRequest = request;
+        Request newRequest = request.copy();
         newRequest.setData(null);
         return newRequest;
     }