Fixed JENKINS-29052

jenkinsci · Aug 17, 2015 · 5eeaed1 · 5eeaed1
1 parent 1647bd4
commit 5eeaed1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/net/praqma/jenkins/memorymap/parser/AbstractMemoryMapParser.java b/src/main/java/net/praqma/jenkins/memorymap/parser/AbstractMemoryMapParser.java
@@ -77,7 +77,7 @@ public abstract class AbstractMemoryMapParser implements Describable<AbstractMem
 
     public AbstractMemoryMapParser () {  
         this.patterns = ListUtils.EMPTY_LIST;
-        this.graphConfiguration = new ArrayList<MemoryMapGraphConfiguration>();
+        this.graphConfiguration = new ArrayList<>();
         this.parserUniqueName = "Default";
     }
 
@@ -92,6 +92,7 @@ public AbstractMemoryMapParser(String parserUniqueName, String mapFile, String c
     }
 
     public Object readResolve(){
+        if (graphConfiguration == null) graphConfiguration = new ArrayList<>();
         if(getParserUniqueName() == null || getParserUniqueName() == null){
             logger.log(Level.FINE, "Entering 1.x compatibility block, assigning name: Default");
             setParserUniqueName("Default");

diff --git a/src/test/java/net/praqma/jenkins/integration/JENKINS_29052_IT.java b/src/test/java/net/praqma/jenkins/integration/JENKINS_29052_IT.java
@@ -16,7 +16,7 @@ public class JENKINS_29052_IT {
     public JenkinsRule jenkins = new JenkinsRule();
 
     @Test
-    public void failsWithoutGraphs() throws Exception {
+    public void succeedsWithoutGraphs() throws Exception {
         GccMemoryMapParser parser = createParser();
         parser.setMapFile("gcc482.map");
         parser.setConfigurationFile("prom482.ld");
@@ -27,7 +27,7 @@ public void failsWithoutGraphs() throws Exception {
 
         FreeStyleBuild build = TestUtils.runNewBuild(project);
         TestUtils.printBuildConsoleLog(build, jenkins);
-        jenkins.assertBuildStatus(Result.FAILURE, build);
+        jenkins.assertBuildStatus(Result.SUCCESS, build);
     }
 
     private GccMemoryMapParser createParser() {