From 87df0f7f2d7f0758b02359f84a50593ff5005e4c Mon Sep 17 00:00:00 2001
From: david6969xin <86217945+david6969xin@users.noreply.github.com>
Date: Thu, 3 Mar 2022 10:53:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=9A=E4=B8=8B=E6=B8=B8=E5=AE=9E?=
 =?UTF-8?q?=E4=BE=8B=EF=BC=8C=E9=AB=98TPS=E4=B8=8B=E7=9A=84=E6=80=A7?=
 =?UTF-8?q?=E8=83=BD=E9=97=AE=E9=A2=98[2705]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../loadbalance/filter/IsolationDiscoveryFilter.java        | 2 +-
 java-chassis-dependencies/default/pom.xml                   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/IsolationDiscoveryFilter.java b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/IsolationDiscoveryFilter.java
index b81d2e25ca4..c4b99d31434 100644
--- a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/IsolationDiscoveryFilter.java
+++ b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/IsolationDiscoveryFilter.java
@@ -106,7 +106,7 @@ public DiscoveryTreeNode discovery(DiscoveryContext context, DiscoveryTreeNode p
       }
     });
 
-    DiscoveryTreeNode child = new DiscoveryTreeNode();
+    DiscoveryTreeNode child = parent.children().computeIfAbsent("filterred", etn -> new DiscoveryTreeNode());
     if (ZoneAwareDiscoveryFilter.GROUP_Instances_All
         .equals(context.getContextParameter(ZoneAwareDiscoveryFilter.KEY_ZONE_AWARE_STEP)) && filteredServers.isEmpty()
         && emptyProtection.get()) {
diff --git a/java-chassis-dependencies/default/pom.xml b/java-chassis-dependencies/default/pom.xml
index 02258d32af2..008d1436a54 100644
--- a/java-chassis-dependencies/default/pom.xml
+++ b/java-chassis-dependencies/default/pom.xml
@@ -84,7 +84,7 @@
     <mock-server.version>3.10.4</mock-server.version>
     <narayana.version>5.3.2.Final</narayana.version>
     <netflix-commons.version>0.3.0</netflix-commons.version>
-    <netty.version>4.1.67.Final</netty.version>
+    <netty.version>4.1.74.Final</netty.version>
     <okhttp3.version>3.14.2</okhttp3.version>
     <powermock.version>1.6.2</powermock.version>
     <prometheus.version>0.6.0</prometheus.version>
@@ -105,10 +105,10 @@
     <stax2-api.version>4.2</stax2-api.version>
     <swagger.version>1.5.22</swagger.version>
     <swagger2markup.version>1.3.3</swagger2markup.version>
-    <tcnetty.version>2.0.40.Final</tcnetty.version>
+    <tcnetty.version>2.0.48.Final</tcnetty.version>
     <tec-zkclient.version>0.10</tec-zkclient.version>
     <tomakehurst.version>2.6.0</tomakehurst.version>
-    <vertx.version>3.9.8</vertx.version>
+    <vertx.version>3.9.11</vertx.version>
     <xstream.version>1.4.11.1</xstream.version>
     <zipkin.version>2.19.1</zipkin.version>
     <zipkin-reporter.version>2.7.13</zipkin-reporter.version>

From 3441a7cdbaf29ba2a25876c3c8cbdc028192c76a Mon Sep 17 00:00:00 2001
From: lbc97 <934475664@qq.com>
Date: Fri, 4 Mar 2022 14:49:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=9A=E4=B8=8B=E6=B8=B8=E5=AE=9E?=
 =?UTF-8?q?=E4=BE=8B=EF=BC=8C=E9=AB=98TPS=E4=B8=8B=E7=9A=84=E6=80=A7?=
 =?UTF-8?q?=E8=83=BD=E9=97=AE=E9=A2=98[2705]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 java-chassis-dependencies/default/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java-chassis-dependencies/default/pom.xml b/java-chassis-dependencies/default/pom.xml
index 008d1436a54..02258d32af2 100644
--- a/java-chassis-dependencies/default/pom.xml
+++ b/java-chassis-dependencies/default/pom.xml
@@ -84,7 +84,7 @@
     <mock-server.version>3.10.4</mock-server.version>
     <narayana.version>5.3.2.Final</narayana.version>
     <netflix-commons.version>0.3.0</netflix-commons.version>
-    <netty.version>4.1.74.Final</netty.version>
+    <netty.version>4.1.67.Final</netty.version>
     <okhttp3.version>3.14.2</okhttp3.version>
     <powermock.version>1.6.2</powermock.version>
     <prometheus.version>0.6.0</prometheus.version>
@@ -105,10 +105,10 @@
     <stax2-api.version>4.2</stax2-api.version>
     <swagger.version>1.5.22</swagger.version>
     <swagger2markup.version>1.3.3</swagger2markup.version>
-    <tcnetty.version>2.0.48.Final</tcnetty.version>
+    <tcnetty.version>2.0.40.Final</tcnetty.version>
     <tec-zkclient.version>0.10</tec-zkclient.version>
     <tomakehurst.version>2.6.0</tomakehurst.version>
-    <vertx.version>3.9.11</vertx.version>
+    <vertx.version>3.9.8</vertx.version>
     <xstream.version>1.4.11.1</xstream.version>
     <zipkin.version>2.19.1</zipkin.version>
     <zipkin-reporter.version>2.7.13</zipkin-reporter.version>