Fix NPE

jd-opensource · May 27, 2024 · cd48188 · cd48188
1 parent a2c1888
commit cd48188
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/...i/src/main/java/com/jd/live/agent/governance/invoke/filter/inbound/UnitInboundFilter.java b/...i/src/main/java/com/jd/live/agent/governance/invoke/filter/inbound/UnitInboundFilter.java
@@ -79,6 +79,7 @@ protected <T extends InboundRequest> UnitAction unitAction(InboundInvocation<T>
         ServicePolicy servicePolicy = invocation.getServiceMetadata().getServicePolicy();
         ServiceLivePolicy livePolicy = servicePolicy == null ? null : servicePolicy.getLivePolicy();
         UnitPolicy unitPolicy = livePolicy == null ? UnitPolicy.NONE : livePolicy.getUnitPolicy();
+        unitPolicy = unitPolicy == null ? UnitPolicy.NONE : unitPolicy;
         LiveMetadata liveMetadata = invocation.getLiveMetadata();
         UnitRule rule = liveMetadata.getUnitRule();
         String variable = liveMetadata.getVariable();

diff --git a/...e-api/src/main/java/com/jd/live/agent/governance/invoke/filter/route/UnitRouteFilter.java b/...e-api/src/main/java/com/jd/live/agent/governance/invoke/filter/route/UnitRouteFilter.java
@@ -98,6 +98,7 @@ private <T extends OutboundRequest> RouteTarget route(OutboundInvocation<T> invo
         ServicePolicy servicePolicy = serviceMetadata.getServicePolicy();
         ServiceLivePolicy livePolicy = servicePolicy == null ? null : servicePolicy.getLivePolicy();
         UnitPolicy unitPolicy = livePolicy == null || liveMetadata.getUnitRule() == null ? UnitPolicy.NONE : livePolicy.getUnitPolicy();
+        unitPolicy = unitPolicy == null ? UnitPolicy.NONE : unitPolicy;
         switch (unitPolicy) {
             case NONE:
                 // Arbitrary call

diff --git a/.../main/java/com/jd/live/agent/governance/invoke/metadata/parser/ServiceMetadataParser.java b/.../main/java/com/jd/live/agent/governance/invoke/metadata/parser/ServiceMetadataParser.java
@@ -288,7 +288,7 @@ public ServiceMetadata configure(ServiceMetadata metadata, UnitRule unitRule) {
             }
             ServicePolicy policy = metadata.getServicePolicy();
             ServiceLivePolicy livePolicy = policy == null ? null : policy.getLivePolicy();
-            if (livePolicy != null && livePolicy.getUnitPolicy() != UnitPolicy.NONE) {
+            if (livePolicy != null && livePolicy.getUnitPolicy() != null && livePolicy.getUnitPolicy() != UnitPolicy.NONE) {
                 return metadata;
             }
             livePolicy = livePolicy != null ? livePolicy.clone() : new ServiceLivePolicy();

diff --git a/...api/src/main/java/com/jd/live/agent/governance/policy/service/live/ServiceLivePolicy.java b/...api/src/main/java/com/jd/live/agent/governance/policy/service/live/ServiceLivePolicy.java
@@ -151,7 +151,7 @@ public void supplement(ServiceLivePolicy source) {
             writeProtect = source.getWriteProtect();
         }
         if (unitPolicy == null) {
-            unitPolicy = source.getUnitPolicy();
+            unitPolicy = source.getUnitPolicy() == null ? UnitPolicy.NONE : source.getUnitPolicy();
         }
         if (defaultUnitThreshold == null) {
             defaultUnitThreshold = source.getDefaultUnitThreshold();