Fix JENKINS-12936

jenkinsci · Feb 29, 2012 · 9fa3650 · 9fa3650
1 parent c7d8ee1
commit 9fa3650
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectInfo.java b/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectInfo.java
@@ -2,6 +2,7 @@
 
 import hudson.Util;
 import org.jenkinsci.lib.envinject.EnvInjectException;
+import org.jenkinsci.plugins.envinject.service.PropertiesGetter;
 import org.jenkinsci.plugins.envinject.service.PropertiesLoader;
 import org.kohsuke.stapler.DataBoundConstructor;
 
@@ -33,15 +34,21 @@ public String getPropertiesFilePath() {
         return propertiesFilePath;
     }
 
-    @SuppressWarnings("unused")
+    @SuppressWarnings({"unused", "deprecation"})
     public String getPropertiesContent() {
+
+        if (propertiesContentMap != null && propertiesContentMap.size() != 0) {
+            PropertiesGetter propertiesGetter = new PropertiesGetter();
+            return propertiesGetter.getPropertiesContent(propertiesContentMap);
+        }
+
         return propertiesContent;
     }
 
     @SuppressWarnings("deprecation")
     public Map<String, String> getPropertiesContentMap() {
 
-        if (propertiesContentMap != null) {
+        if (propertiesContentMap != null && propertiesContentMap.size() != 0) {
             return propertiesContentMap;
         }
 

diff --git a/src/main/java/org/jenkinsci/plugins/envinject/service/PropertiesGetter.java b/src/main/java/org/jenkinsci/plugins/envinject/service/PropertiesGetter.java
@@ -9,6 +9,11 @@
 public class PropertiesGetter implements Serializable {
 
     public String getPropertiesContent(Map<String, String> propertiesContent) {
+
+        if (propertiesContent == null) {
+            return null;
+        }
+
         StringBuffer sb = new StringBuffer();
         for (Map.Entry<String, String> entry : propertiesContent.entrySet()) {
             sb.append(entry.getKey() + "=" + entry.getValue() + "\n");