Fix JENKINS-15006 and JENKINS-14628

jenkinsci · Aug 31, 2012 · 3ec3af4 · 3ec3af4
1 parent b6bdad5
commit 3ec3af4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/xunit/XUnitPublisher.java b/src/main/java/org/jenkinsci/plugins/xunit/XUnitPublisher.java
@@ -20,6 +20,7 @@
 import hudson.tasks.junit.TestResult;
 import hudson.tasks.junit.TestResultAction;
 import hudson.tasks.test.TestResultProjectAction;
+import net.sf.json.JSONException;
 import net.sf.json.JSONObject;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.types.FileSet;
@@ -435,7 +436,13 @@ public Publisher newInstance(StaplerRequest req, JSONObject formData) throws For
                     req, formData, "tools", getListXUnitTypeDescriptors());
             List<XUnitThreshold> thresholds = Descriptor.newInstancesFromHeteroList(
                     req, formData, "thresholds", getListXUnitThresholdDescriptors());
-            int thresholdMode = formData.getInt("thresholdMode");
+            int thresholdMode = 0;
+            try{
+                thresholdMode = formData.getInt("thresholdMode");
+            }
+            catch (JSONException e){
+                //ignore
+            }
             return new XUnitPublisher(types.toArray(new TestType[types.size()]), thresholds.toArray(new XUnitThreshold[thresholds.size()]), thresholdMode);
         }
     }