Fixed issue JENKINS-14522 again as the NULL pointer exception was sho…

…wing up again.
jenkinsci · Nov 12, 2012 · a6fa71f · a6fa71f
1 parent d37420b
commit a6fa71f
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/view/dashboard/test/TestTrendChart.java b/src/main/java/hudson/plugins/view/dashboard/test/TestTrendChart.java
@@ -70,7 +70,7 @@ public TestTrendChart(String name, int graphWidth, int graphHeight,
       this.graphWidth = graphWidth;
       this.graphHeight = graphHeight;
       this.dateRange = dateRange;
-      this.displayStatus = DisplayStatus.valueOf(display);
+      this.displayStatus = display != null ? DisplayStatus.valueOf(display) : DisplayStatus.ALL;
       DashboardLog.debug("TestTrendChart", "ctor");
    }
 
@@ -98,6 +98,15 @@ public String getDisplayStatus() {
    public void setDisplayStatus(String s) {
       displayStatus = DisplayStatus.valueOf(s);
    }
+
+   public DisplayStatus getDisplayStatusEnum() {
+      if (displayStatus == null)
+      {
+         displayStatus = DisplayStatus.ALL;
+         DashboardLog.info("TestTrendChart", "display is null - setting to ALL");
+      }
+      return displayStatus;
+   }
 
    /**
     * Graph of duration of tests over time.
@@ -208,7 +217,7 @@ protected JFreeChart createGraph() {
             StackedAreaRenderer ar = new StackedAreaRenderer2();
             plot.setRenderer(ar);
 
-            switch (displayStatus) {
+            switch (getDisplayStatusEnum()) {
                case SUCCESS:
                   ar.setSeriesPaint(0, ColorPalette.BLUE);
                   break;
@@ -239,7 +248,7 @@ private CategoryDataset buildDataSet(
       for (Map.Entry<LocalDate, TestResultSummary> entry : summaries.entrySet()) {
          LocalDateLabel label = new LocalDateLabel(entry.getKey());
 
-         switch (displayStatus) {
+         switch (getDisplayStatusEnum()) {
             case SUCCESS:
                dsb.add(entry.getValue().getSuccess(),
                        Messages.Dashboard_Total(), label);