diff --git a/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesMeshEnvListener.java b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesMeshEnvListener.java index 94a58b0d37..966ad64dc6 100644 --- a/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesMeshEnvListener.java +++ b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesMeshEnvListener.java @@ -36,9 +36,9 @@ import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_ERR public class KubernetesMeshEnvListener implements MeshEnvListener { public static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(KubernetesMeshEnvListener.class); - private volatile static boolean usingApiServer = false; - private volatile static KubernetesClient kubernetesClient; - private volatile static String namespace; + private static volatile boolean usingApiServer = false; + private static volatile KubernetesClient kubernetesClient; + private static volatile String namespace; private final Map appRuleListenerMap = new ConcurrentHashMap<>(); @@ -103,11 +103,11 @@ public class KubernetesMeshEnvListener implements MeshEnvListener { } } - @Override - public void onClose(WatcherException cause) { - // ignore - } - }); + @Override + public void onClose(WatcherException cause) { + // ignore + } + }); vsAppWatch.put(appName, watch); try { GenericKubernetesResource vsRule = kubernetesClient diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/ListenerInvokerWrapper.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/ListenerInvokerWrapper.java index b4ee190812..2dd6d9c7e8 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/ListenerInvokerWrapper.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/ListenerInvokerWrapper.java @@ -17,6 +17,7 @@ package org.apache.dubbo.rpc.listener; import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.constants.LoggerCodeConstants; import org.apache.dubbo.common.logger.ErrorTypeAwareLogger; import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.dubbo.common.utils.CollectionUtils; @@ -100,11 +101,12 @@ public class ListenerInvokerWrapper implements Invoker { try { consumer.accept(listener); } catch (RuntimeException t) { - logger.error(t.getMessage(), t); + logger.error(LoggerCodeConstants.INTERNAL_ERROR, "wrapped listener internal error", "", t.getMessage(), t); exception = t; } } } + if (exception != null) { throw exception; }