Fix JENKINS-12876

jenkinsci · Feb 26, 2012 · db8e61f · db8e61f
1 parent 4199b27
commit db8e61f
Showing 1 changed file with 19 additions and 21 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectInfo.java b/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectInfo.java
@@ -2,12 +2,11 @@
 
 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;
 
-import java.io.IOException;
 import java.io.Serializable;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -16,49 +15,48 @@
 public class EnvInjectInfo implements Serializable {
 
     protected String propertiesFilePath;
+    protected String propertiesContent;
 
-    private Map<String, String> propertiesContentMap;
+    @Deprecated
+    private transient Map<String, String> propertiesContentMap;
 
-    protected transient String propertiesContent;
+    @Deprecated
     protected transient boolean populateTriggerCause;
 
     @DataBoundConstructor
     public EnvInjectInfo(String propertiesFilePath, String propertiesContent) {
         this.propertiesFilePath = Util.fixEmpty(propertiesFilePath);
-        PropertiesLoader loader = new PropertiesLoader();
-        try {
-            propertiesContentMap = loader.getVarsFromPropertiesContent(propertiesContent);
-        } catch (EnvInjectException e) {
-            e.printStackTrace();
-        }
+        this.propertiesContent = Util.fixEmpty(propertiesContent);
     }
 
     public String getPropertiesFilePath() {
         return propertiesFilePath;
     }
 
-    public Map<String, String> getPropertiesContentMap() {
-        return propertiesContentMap;
-    }
-
     @SuppressWarnings("unused")
     public String getPropertiesContent() {
+        return propertiesContent;
+    }
+
+    @SuppressWarnings("deprecation")
+    public Map<String, String> getPropertiesContentMap() {
+
         if (propertiesContentMap != null) {
-            PropertiesGetter propertiesGetter = new PropertiesGetter();
-            return propertiesGetter.getPropertiesContent(propertiesContentMap);
+            return propertiesContentMap;
         }
-        return null;
-    }
 
-    private Object readResolve() throws IOException {
         if (propertiesContent != null) {
+            Map<String, String> contentMap = new HashMap<String, String>();
             PropertiesLoader loader = new PropertiesLoader();
             try {
-                propertiesContentMap = loader.getVarsFromPropertiesContent(propertiesContent);
+                contentMap = loader.getVarsFromPropertiesContent(propertiesContent);
             } catch (EnvInjectException e) {
                 e.printStackTrace();
             }
+            return contentMap;
         }
-        return this;
+
+        return null;
     }
+
 }