You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/01/07 09:15:52 UTC

svn commit: r1429700 - /openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java

Author: rmannibucau
Date: Mon Jan  7 08:15:51 2013
New Revision: 1429700

URL: http://svn.apache.org/viewvc?rev=1429700&view=rev
Log:
TOMEE-708 null value for system variables

Modified:
    openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java

Modified: openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1429700&r1=1429699&r2=1429700&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java (original)
+++ openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java Mon Jan  7 08:15:51 2013
@@ -528,10 +528,13 @@ public abstract class AbstractTomEEMojo 
         if (systemVariables != null) {
             for (Map.Entry<String, String> entry : systemVariables.entrySet()) {
                 final String key = entry.getKey();
-                if (entry.getValue().contains(" ")) {
-                    strings.add(String.format("'-D%s=%s'", key, entry.getValue()));
+                final String value = entry.getValue();
+                if (value == null) {
+                    strings.add("-D" + key);
+                } else if (value.contains(" ")) {
+                    strings.add(String.format("'-D%s=%s'", key, value));
                 } else {
-                    strings.add(String.format("-D%s=%s", key, entry.getValue()));
+                    strings.add(String.format("-D%s=%s", key, value));
                 }
 
                 if (deployOpenEjbAppKey.equals(key)) {