[FIXED JENKINS-40113] sematic-versioning-plugin causes dashboard to biff

jenkinsci · Jan 9, 2017 · 07d2b75 · 07d2b75
1 parent 97b5282
commit 07d2b75
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/SemanticVersioning/SemanticVersionColumn.java b/src/main/java/org/jenkinsci/plugins/SemanticVersioning/SemanticVersionColumn.java
@@ -32,6 +32,7 @@
 import hudson.views.ListViewColumn;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
+import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.SemanticVersioning.columnDisplay.AbstractColumnDisplayStrategy;
 import org.jenkinsci.plugins.SemanticVersioning.columnDisplay.ColumnDisplayStrategy;
 import org.jenkinsci.plugins.SemanticVersioning.columnDisplay.LastSuccessfulBuildStrategy;
@@ -83,8 +84,9 @@ public SemanticVersionColumnDescriptor() {
 
         @Override
         public ListViewColumn newInstance(StaplerRequest req, JSONObject formData) throws FormException {
-            String strategy = formData == null ? LastSuccessfulBuildStrategy.class.getCanonicalName() : formData.getString("displayStrategy");
-            return new SemanticVersionColumn(strategy);
+            String strategy = formData == null ? null : formData.optString("displayStrategy");
+            return new SemanticVersionColumn(StringUtils.defaultIfBlank(strategy,
+                    LastSuccessfulBuildStrategy.class.getCanonicalName()));
         }
 
         public ListBoxModel doFillDisplayStrategyItems() {