Fix: Prevent NullPointerException in getActiveEnvs by checking containsKey

youngmin0104 · youngmin0104 · commit 68a686c0a03b · 2025-07-05T07:24:00.000+09:00
diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/PortalSettings.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/PortalSettings.java
@@ -99,7 +99,7 @@ public List<Env> getActiveEnvs() {
 
   public boolean isEnvActive(Env env) {
     Boolean mark = envStatusMark.get(env);
-    return mark != null && mark;
+    return Boolean.TRUE.equals(mark);
   }
 
   private class HealthCheckTask implements Runnable {
@@ -173,4 +173,4 @@ private void handleEnvDown(Env env) {
     }
 
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public List<Env> getActiveEnvs() {`
`99`	`99`
`100`	`100`	`public boolean isEnvActive(Env env) {`
`101`	`101`	`Boolean mark = envStatusMark.get(env);`
`102`		`- return mark != null && mark;`
	`102`	`+ return Boolean.TRUE.equals(mark);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`private class HealthCheckTask implements Runnable {`
`@@ -173,4 +173,4 @@ private void handleEnvDown(Env env) {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`}`
`176`		`-}`
	`176`	`+}`