Fix: Prevent NullPointerException in getActiveEnvs by checking contai…

[youngmin0104]

Hi,

Fixes a potential 'NullPointerException' in the 'getActiveEnvs()' method by ensuring that 'envStatusMark.get(env)' is only called after confirming that the key exists using 'containsKey()'.

Expected Behavior

When iterating through 'allEnvs', only environments with a 'true' value in 'envStatusMark' should be added to 'activeEnvs', and no 'NullPointerException' should occur regardless of the contents of 'envStatusMark'.

Actual Behavior

Previously, if 'envStatusMark.get(env)' returned null, a 'NullPointerException' could occur during the evaluation of the 'if' condition.

This Patch

This patch prevents a subtle 'NullPointerException' with minimal changes while preserving the original logic. It improves the method's stability and ensures that only valid and true entries are added to 'activeEnvs'.

Thanks for reviewing.

Summary by CodeRabbit

• Bug Fixes
  • Improved stability when determining active environments, preventing potential errors if an environment is missing from the settings.

[coderabbitai]

Walkthrough

The isEnvActive(Env env) method in the PortalSettings class was updated to replace the null-safe boolean check mark != null && mark with Boolean.TRUE.equals(mark). This change improves clarity and null safety without altering the existing logic or control flow.

Changes

File Path	Change Summary
apollo-portal/src/main/java/com/ctrip/framework/.../PortalSettings.java	Replaced mark != null && mark with Boolean.TRUE.equals(mark) in isEnvActive(Env env) method

Poem

In the meadow of code, a check refined,
Clearer and safer, now well-defined.
No loops or traps, just logic bright,
A hop ahead in the coding night.
With clarity gained, the path is free,
A rabbit’s cheer for harmony! 🐇✨

---

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 7673f8e and 68a686c.

📒 Files selected for processing (1)

• apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/PortalSettings.java (2 hunks)

🚧 Files skipped from review as they are similar to previous changes (1)

• apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/PortalSettings.java

⏰ Context from checks skipped due to timeout of 90000ms (2)

• GitHub Check: license
• GitHub Check: build (8)

✨ Finishing Touches

• 📝 Generate Docstrings

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>, please review it.
  • Explain this complex logic.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai explain this code block.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
  • @coderabbitai read src/utils.ts and explain its main purpose.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai generate docstrings to generate docstrings for this PR.
• @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Other keywords and placeholders

• Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
• Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
• Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.

[github-actions]

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

[coderabbitai]

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 2139d2a and 81fffda.

📒 Files selected for processing (1)

• apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/PortalSettings.java (1 hunks)

⏰ Context from checks skipped due to timeout of 90000ms (1)

• GitHub Check: build (8)

[nobodyiam]

How about replacing all the occurrences of envStatusMark.get(env) with isEnvActive(env)?

[youngmin0104]

How about replacing all the occurrences of envStatusMark.get(env) with isEnvActive(env)?

Thank you for the suggestion! I have updated the code to use the isEnvActive(env) helper method for better readability and maintainability. Please take a look at the updated version.

[nobodyiam]

How about replacing all the occurrences of envStatusMark.get(env) with isEnvActive(env)?

Thank you for the suggestion! I have updated the code to use the isEnvActive(env) helper method for better readability and maintainability. Please take a look at the updated version.

Please replace ALL instances of envStatusMark.get(env) and sign the CLA as instructed by the CLA bot above.

[youngmin0104]

I have read the CLA Document and I hereby sign the CLA

[coderabbitai]

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 77491f9 and 7673f8e.

📒 Files selected for processing (1)

• apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/PortalSettings.java (3 hunks)

⏰ Context from checks skipped due to timeout of 90000ms (1)

• GitHub Check: build (8)

🔇 Additional comments (3)

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/PortalSettings.java (3)

93-93: Good improvement using the helper method.

This change correctly replaces the direct map lookup with the isEnvActive() helper method, following the suggestion from previous reviews to maintain consistency.

---

128-128: Consistent use of helper method, but depends on fixing the recursion bug.

This change correctly uses the isEnvActive() helper method instead of direct map access, which improves consistency. However, this will fail due to the infinite recursion bug in the isEnvActive() method (line 102).

---

158-158: Consistent use of helper method, but depends on fixing the recursion bug.

This change correctly uses the isEnvActive() helper method instead of direct map access, which improves consistency. However, this will fail due to the infinite recursion bug in the isEnvActive() method (line 102).

[youngmin0104]

How about replacing all the occurrences of envStatusMark.get(env) with isEnvActive(env)?

Thank you for the suggestion! I have updated the code to use the isEnvActive(env) helper method for better readability and maintainability. Please take a look at the updated version.

Please replace ALL instances of envStatusMark.get(env) and sign the CLA as instructed by the CLA bot above.

Thank you for the suggestion!

I understand that all occurrences of envStatusMark.get(env) should be replaced with isEnvActive(env).
So I have replaced all instances of envStatusMark.get(env) with isEnvActive(env) as requested.
Please let me know if this approach aligns with your expectations, or if any further adjustments are needed.

[stale]

This pull request has been automatically marked as stale because it has not had activity in the last 30 days. It will be closed in 14 days if no further activity occurs. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions!