You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2024/10/21 02:31:23 UTC
(dubbo) branch 3.4 updated: fix future.sync.set default value=false (#14785)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.4
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.4 by this push:
new f328bb6978 fix future.sync.set default value=false (#14785)
f328bb6978 is described below
commit f328bb697837ee59d15d1531d6709e512908fd74
Author: pengpengfu <35...@users.noreply.github.com>
AuthorDate: Mon Oct 21 10:31:18 2024 +0800
fix future.sync.set default value=false (#14785)
Signed-off-by: bigbird-0101 <16...@qq.com>
---
.../apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java | 2 +-
.../src/main/java/org/apache/dubbo/rpc/AsyncRpcResult.java | 2 +-
.../src/main/java/org/apache/dubbo/rpc/protocol/AbstractInvoker.java | 2 +-
.../src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java | 2 +-
.../src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmInvoker.java | 2 +-
.../src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleInvoker.java | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java
index 190d6cb452..804189c066 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java
@@ -49,7 +49,7 @@ public class MockClusterInvoker<T> implements ClusterInvoker<T> {
private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(MockClusterInvoker.class);
private static final boolean setFutureWhenSync = Boolean.parseBoolean(SystemPropertyConfigUtils.getSystemProperty(
- CommonConstants.ThirdPartyProperty.SET_FUTURE_IN_SYNC_MODE, "true"));
+ CommonConstants.ThirdPartyProperty.SET_FUTURE_IN_SYNC_MODE, "false"));
private final Directory<T> directory;
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncRpcResult.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncRpcResult.java
index c39e6d53a8..0b9ace9aa2 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncRpcResult.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncRpcResult.java
@@ -71,7 +71,7 @@ public class AsyncRpcResult implements Result {
* Whether set future to Thread Local when invocation mode is sync
*/
private static final boolean setFutureWhenSync = Boolean.parseBoolean(SystemPropertyConfigUtils.getSystemProperty(
- CommonConstants.ThirdPartyProperty.SET_FUTURE_IN_SYNC_MODE, "true"));
+ CommonConstants.ThirdPartyProperty.SET_FUTURE_IN_SYNC_MODE, "false"));
public AsyncRpcResult(CompletableFuture<AppResponse> future, Invocation invocation) {
this.responseFuture = future;
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractInvoker.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractInvoker.java
index 28cc810cd2..dd14e29960 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractInvoker.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractInvoker.java
@@ -94,7 +94,7 @@ public abstract class AbstractInvoker<T> implements Invoker<T> {
* Whether set future to Thread Local when invocation mode is sync
*/
private static final boolean setFutureWhenSync = Boolean.parseBoolean(SystemPropertyConfigUtils.getSystemProperty(
- CommonConstants.ThirdPartyProperty.SET_FUTURE_IN_SYNC_MODE, "true"));
+ CommonConstants.ThirdPartyProperty.SET_FUTURE_IN_SYNC_MODE, "false"));
// -- Constructor
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java
index e7f2d4fa09..28f9fa03ad 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java
@@ -73,7 +73,7 @@ public class DubboInvoker<T> extends AbstractInvoker<T> {
private final int serverShutdownTimeout;
private static final boolean setFutureWhenSync = Boolean.parseBoolean(SystemPropertyConfigUtils.getSystemProperty(
- CommonConstants.ThirdPartyProperty.SET_FUTURE_IN_SYNC_MODE, "true"));
+ CommonConstants.ThirdPartyProperty.SET_FUTURE_IN_SYNC_MODE, "false"));
public DubboInvoker(Class<T> serviceType, URL url, ClientsProvider clientsProvider) {
this(serviceType, url, clientsProvider, null);
diff --git a/dubbo-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmInvoker.java b/dubbo-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmInvoker.java
index c23f01e99e..be129c3499 100644
--- a/dubbo-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmInvoker.java
+++ b/dubbo-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmInvoker.java
@@ -75,7 +75,7 @@ public class InjvmInvoker<T> extends AbstractInvoker<T> {
private final boolean shouldIgnoreSameModule;
private static final boolean setFutureWhenSync = Boolean.parseBoolean(SystemPropertyConfigUtils.getSystemProperty(
- CommonConstants.ThirdPartyProperty.SET_FUTURE_IN_SYNC_MODE, "true"));
+ CommonConstants.ThirdPartyProperty.SET_FUTURE_IN_SYNC_MODE, "false"));
InjvmInvoker(Class<T> type, URL url, String key, Map<String, Exporter<?>> exporterMap) {
super(type, url);
diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleInvoker.java b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleInvoker.java
index 6a26fbc32f..34d1d27b15 100644
--- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleInvoker.java
+++ b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleInvoker.java
@@ -96,7 +96,7 @@ public class TripleInvoker<T> extends AbstractInvoker<T> {
private final TripleWriteQueue writeQueue = new TripleWriteQueue(256);
private static final boolean setFutureWhenSync = Boolean.parseBoolean(SystemPropertyConfigUtils.getSystemProperty(
- CommonConstants.ThirdPartyProperty.SET_FUTURE_IN_SYNC_MODE, "true"));
+ CommonConstants.ThirdPartyProperty.SET_FUTURE_IN_SYNC_MODE, "false"));
private final PackableMethodFactory packableMethodFactory;
private final Map<MethodDescriptor, PackableMethod> packableMethodCache = new ConcurrentHashMap<>();
private static Compressor compressor;