fix timeout type cast exception (#10644)

Signed-off-by: crazyhzm <crazyhzm@gmail.com> Signed-off-by: crazyhzm <crazyhzm@gmail.com>
apache · Sep 20, 2022 · 37b205b · 37b205b
1 parent 89ef73d
commit 37b205b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/RpcUtils.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/RpcUtils.java
@@ -259,8 +259,17 @@ public static long getTimeout(URL url, String methodName, RpcContext context, lo
         return timeout;
     }
 
+    public static long getTimeoutFromInvocation(Invocation invocation, long defaultTimeout) {
+        long timeout = defaultTimeout;
+        Object genericTimeout = invocation.getObjectAttachment(TIMEOUT_KEY);
+        if (genericTimeout != null) {
+            timeout = convertToNumber(genericTimeout, defaultTimeout);
+        }
+        return timeout;
+    }
+
     private static long convertToNumber(Object obj, long defaultTimeout) {
-        long timeout = 0;
+        long timeout = defaultTimeout;
         try {
             if (obj instanceof String) {
                 timeout = Long.parseLong((String) obj);

diff --git a/...o-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleInvoker.java b/...o-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleInvoker.java
@@ -306,7 +306,7 @@ public void destroy() {
 
     private int calculateTimeout(Invocation invocation, String methodName) {
         if (invocation.getObjectAttachment(TIMEOUT_KEY) != null) {
-            return (int) invocation.getObjectAttachment(TIMEOUT_KEY);
+            return (int) RpcUtils.getTimeoutFromInvocation(invocation, 3000);
         }
         Object countdown = RpcContext.getClientAttachment().getObjectAttachment(TIME_COUNTDOWN_KEY);
         int timeout;