fix: netty3 check channel available

weibocom · May 9, 2019 · 280be47 · 280be47
1 parent 8c8562c
commit 280be47
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/motan-core/src/main/java/com/weibo/api/motan/registry/support/AbstractRegistry.java b/motan-core/src/main/java/com/weibo/api/motan/registry/support/AbstractRegistry.java
@@ -210,9 +210,7 @@ protected void notify(URL refUrl, NotifyListener listener, List<URL> urls) {
         }
 
         // refresh local urls cache
-        for (String nodeType : nodeTypeUrlsInRs.keySet()) {
-            curls.put(nodeType, nodeTypeUrlsInRs.get(nodeType));
-        }
+        curls.putAll(nodeTypeUrlsInRs);
 
         for (List<URL> us : nodeTypeUrlsInRs.values()) {
             listener.notify(getUrl(), us);

diff --git a/motan-transport-netty/src/main/java/com/weibo/api/motan/transport/netty/NettyChannel.java b/motan-transport-netty/src/main/java/com/weibo/api/motan/transport/netty/NettyChannel.java
@@ -180,8 +180,7 @@ public synchronized void close(int timeout) {
 				channel.close();
 			}
 		} catch (Exception e) {
-			LoggerUtil
-					.error("NettyChannel close Error: " + nettyClient.getUrl().getUri() + " local=" + localAddress, e);
+			LoggerUtil.error("NettyChannel close Error: " + nettyClient.getUrl().getUri() + " local=" + localAddress, e);
 		}
 	}
 
@@ -202,7 +201,7 @@ public boolean isClosed() {
 
 	@Override
 	public boolean isAvailable() {
-		return state.isAliveState();
+		return state.isAliveState() && channel != null && channel.isConnected();
 	}
 
 	@Override