MNG-8178: Fall back to System.getProperty for missing context props

A call to context.getSystemProperties() may yield empty an empty map, or one missing the desired key, which makes a subsequent call of toLowerCase fail with a NullPointerException. Fall-back to using System.getProperty (with an empty default, in case that one fails too).
apache · Jul 9, 2024 · 1029de6 · 1029de6
1 parent 36645f6
commit 1029de6
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/.../main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java b/.../main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
@@ -22,6 22,7 @@
 import javax.inject.Singleton;
 
 import java.util.Locale;
 import java.util.Map;
 
 import org.apache.maven.model.Activation;
 import org.apache.maven.model.ActivationOS;
@@ -42,6 43,14 @@ public class OperatingSystemProfileActivator implements ProfileActivator {
 
  private static final String REGEX_PREFIX = "regex:";
 
  private static String systemProperty(Map<String, String> map, String key) {
  String v = map.get(key);
  if (v == null) {
  v = System.getProperty(key, "");
  }
  return v;
  }
 
  @Override
  public boolean isActive(Profile profile, ProfileActivationContext context, ModelProblemCollector problems) {
  Activation activation = profile.getActivation();
@@ -58,9 67,12 @@ public boolean isActive(Profile profile, ProfileActivationContext context, Model
 
  boolean active = ensureAtLeastOneNonNull(os);
 
- String actualOsName = context.getSystemProperties().get("os.name").toLowerCase(Locale.ENGLISH);
- String actualOsArch = context.getSystemProperties().get("os.arch").toLowerCase(Locale.ENGLISH);
- String actualOsVersion = context.getSystemProperties().get("os.version").toLowerCase(Locale.ENGLISH);
  String actualOsName =
  systemProperty(context.getSystemProperties(), "os.name").toLowerCase(Locale.ENGLISH);
  String actualOsArch =
  systemProperty(context.getSystemProperties(), "os.arch").toLowerCase(Locale.ENGLISH);
  String actualOsVersion =
  systemProperty(context.getSystemProperties(), "os.version").toLowerCase(Locale.ENGLISH);
 
  if (active && os.getFamily() != null) {
  active = determineFamilyMatch(os.getFamily(), actualOsName);