Fix NPE when address is null

apache · Dec 2, 2024 · 3d9dfd4 · 3d9dfd4
1 parent 1ac934b
commit 3d9dfd4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 40 deletions.
diff --git a/...src/main/java/org/apache/dubbo/common/threadpool/manager/IsolationExecutorRepository.java b/...src/main/java/org/apache/dubbo/common/threadpool/manager/IsolationExecutorRepository.java
@@ -46,7 +46,7 @@ protected URL setThreadNameIfAbsent(URL url, String executorCacheKey) {
 
     @Override
     protected String getProviderKey(URL url) {
-        if (url.hasAttribute(SERVICE_EXECUTOR)) {
+        if (url.getAttributes().containsKey(SERVICE_EXECUTOR)) {
             return url.getServiceKey();
         } else {
             return super.getProviderKey(url);
@@ -55,7 +55,7 @@ protected String getProviderKey(URL url) {
 
     @Override
     protected String getProviderKey(ProviderModel providerModel, URL url) {
-        if (url.hasAttribute(SERVICE_EXECUTOR)) {
+        if (url.getAttributes().containsKey(SERVICE_EXECUTOR)) {
             return providerModel.getServiceKey();
         } else {
             return super.getProviderKey(url);
@@ -64,7 +64,7 @@ protected String getProviderKey(ProviderModel providerModel, URL url) {
 
     @Override
     protected ExecutorService createExecutor(URL url) {
-        Object executor = url.getAttribute(SERVICE_EXECUTOR);
+        Object executor = url.getAttributes().get(SERVICE_EXECUTOR);
         if (executor instanceof ExecutorService) {
             return (ExecutorService) executor;
         }

diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@ -665,7 +665,7 @@ private void processServiceExecutor(URL url) {
              * and obtained it in IsolationExecutorRepository#createExecutor method
              */
             providerModel.getServiceMetadata().addAttribute(SERVICE_EXECUTOR, getExecutor());
-            url.putAttribute(SERVICE_EXECUTOR, getExecutor());
+            url.getAttributes().put(SERVICE_EXECUTOR, getExecutor());
         }
     }
 

diff --git a/.../src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyHttp3ConnectionClient.java b/.../src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyHttp3ConnectionClient.java
@@ -22,6 +22,7 @@
 import org.apache.dubbo.remoting.RemotingException;
 import org.apache.dubbo.remoting.http3.Http3SslContexts;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 
@@ -44,20 +45,21 @@
 
 public final class NettyHttp3ConnectionClient extends AbstractNettyConnectionClient {
 
+    private final Consumer<ChannelPipeline> pipelineConfigurator;
     private AtomicReference<io.netty.channel.Channel> datagramChannel;
     private QuicChannelBootstrap bootstrap;
-    private Consumer<ChannelPipeline> pipelineConfigurator;
 
+    @SuppressWarnings("unchecked")
     public NettyHttp3ConnectionClient(URL url, ChannelHandler handler) throws RemotingException {
         super(url, handler);
+        pipelineConfigurator = (Consumer<ChannelPipeline>) getUrl().getAttribute(PIPELINE_CONFIGURATOR_KEY);
+        Objects.requireNonNull(pipelineConfigurator, "pipelineConfigurator should be set");
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     protected void initConnectionClient() {
         super.initConnectionClient();
         datagramChannel = new AtomicReference<>();
-        pipelineConfigurator = (Consumer<ChannelPipeline>) getUrl().getAttribute(PIPELINE_CONFIGURATOR_KEY);
     }
 
     @Override

diff --git a/...ting-http3/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyHttp3Server.java b/...ting-http3/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyHttp3Server.java
@@ -31,6 +31,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 import io.netty.bootstrap.Bootstrap;
@@ -63,6 +64,7 @@ public class NettyHttp3Server extends AbstractServer {
     public NettyHttp3Server(URL url, ChannelHandler handler) throws RemotingException {
         super(url, ChannelHandlers.wrap(handler, url));
         pipelineConfigurator = (Consumer<ChannelPipeline>) getUrl().getAttribute(PIPELINE_CONFIGURATOR_KEY);
+        Objects.requireNonNull(pipelineConfigurator, "pipelineConfigurator should be set");
         serverShutdownTimeoutMills = ConfigurationUtils.getServerShutdownTimeout(getUrl().getOrDefaultModuleModel());
     }
 
@@ -83,8 +85,8 @@ protected void doOpen() throws Throwable {
                                 @Override
                                 protected void initChannel(QuicChannel ch) {
                                     ChannelPipeline pipeline = ch.pipeline();
-                                    pipeline.addLast(nettyServerHandler);
                                     pipelineConfigurator.accept(pipeline);
+                                    pipeline.addLast(nettyServerHandler);
                                 }
                             })
                             .build())

diff --git a/...emoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/AddressUtils.java b/...emoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/AddressUtils.java
@@ -59,38 +59,6 @@ public static InetSocketAddress getLocalAddress(Channel channel) {
         return (InetSocketAddress) channel.localAddress();
     }
 
-    public static String getRemoteAddressKey(Channel channel) {
-        InetSocketAddress address;
-        for (int i = 0, size = ACCESSORS.size(); i < size; i++) {
-            ChannelAddressAccessor accessor = ACCESSORS.get(i);
-            address = accessor.getRemoteAddress(channel);
-            if (address != null) {
-                return accessor.getProtocol() + ' ' + toAddressString(address);
-            }
-        }
-        InetSocketAddress remoteAddress = (InetSocketAddress) channel.remoteAddress();
-        if (remoteAddress == null) {
-            return "UNKNOWN";
-        }
-        return toAddressString(remoteAddress);
-    }
-
-    public static String getLocalAddressKey(Channel channel) {
-        InetSocketAddress address;
-        for (int i = 0, size = ACCESSORS.size(); i < size; i++) {
-            ChannelAddressAccessor accessor = ACCESSORS.get(i);
-            address = accessor.getLocalAddress(channel);
-            if (address != null) {
-                return accessor.getProtocol() + ' ' + toAddressString(address);
-            }
-        }
-        SocketAddress localAddress = channel.localAddress();
-        if (localAddress == null) {
-            return "UNKNOWN";
-        }
-        return toAddressString((InetSocketAddress) localAddress);
-    }
-
     static void initAddressIfNecessary(NettyChannel nettyChannel) {
         Channel channel = nettyChannel.getNioChannel();
         SocketAddress address = channel.localAddress();
@@ -122,12 +90,18 @@ static InetSocketAddress getRemoteAddress(NettyChannel channel) {
 
     static String getLocalAddressKey(NettyChannel channel) {
         InetSocketAddress address = getLocalAddress(channel);
+        if (address == null) {
+            return "UNKNOWN";
+        }
         String protocol = (String) channel.getAttribute(PROTOCOL_KEY);
         return protocol == null ? toAddressString(address) : protocol + ' ' + toAddressString(address);
     }
 
     static String getRemoteAddressKey(NettyChannel channel) {
         InetSocketAddress address = getRemoteAddress(channel);
+        if (address == null) {
+            return "UNKNOWN";
+        }
         String protocol = (String) channel.getAttribute(PROTOCOL_KEY);
         return protocol == null ? toAddressString(address) : protocol + ' ' + toAddressString(address);
     }