[tomee] branch tomee-9.x updated: TOMEE-3779 - tomee-embedded-maven-plugin fails with NPE

[rzo1]

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/tomee-9.x by this push:
     new aa8921bce1 TOMEE-3779 - tomee-embedded-maven-plugin fails with NPE
aa8921bce1 is described below

commit aa8921bce161b437309230af620924cbc7957a9a
Author: Richard Zowalla <richard.zowa...@hs-heilbronn.de>
AuthorDate: Mon Jan 16 09:27:10 2023 +0100

    TOMEE-3779 - tomee-embedded-maven-plugin fails with NPE
---
 .../java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git 
a/maven/tomee-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java
 
b/maven/tomee-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java
index 1267169827..4dda28960a 100644
--- 
a/maven/tomee-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java
+++ 
b/maven/tomee-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java
@@ -693,7 +693,13 @@ public class TomEEEmbeddedMojo extends AbstractMojo {
         }
         if (containerProperties != null) {
             final Properties props = new Properties();
-            props.putAll(containerProperties);
+            for(Map.Entry<String, String> e : containerProperties.entrySet()) {
+                if(e.getValue() == null) {
+                    getLog().warn("Value for container property '" + 
e.getKey() + "' is NULL. Skipping.'");
+                } else {
+                    props.put(e.getKey(), e.getValue());
+                }
+            }
             config.setProperties(props);
         }
         if (forceJspDevelopment) {