From 8b5d39ed133a013ecc6b77ff7cbd8b3859d11c17 Mon Sep 17 00:00:00 2001
From: Piotrek Zygielo <piotr.zygielo@gmail.com>
Date: Sun, 5 Jan 2025 18:41:12 +0100
Subject: [PATCH] Accept null argument

---
 .../java/com/sun/enterprise/v3/admin/CommandRunnerImpl.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerImpl.java
index 51d9f635a32..6d5b5ffde74 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerImpl.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerImpl.java
@@ -1650,6 +1650,9 @@ private void publishCommandInvokedEvent(ExecutionContext invocation, Subject sub
     }
 
     private ParameterMap maskSecretParameters(ParameterMap parameters) {
+        if (parameters == null) {
+            return parameters;
+        }
         final ParameterMap maskedParameters = new ParameterMap(parameters);
         maskedParameters.entrySet().forEach(entry -> {
             if (PASSWORD_ATTRIBUTE_NAMES.contains(entry.getKey())) {