From 8def8da7884c8a6a0a17095b1adbee555f47df66 Mon Sep 17 00:00:00 2001
From: godfath3r <galatsanosp@gmail.com>
Date: Thu, 14 Jul 2016 20:18:45 +0300
Subject: [PATCH] [JENKINS-36387] Catch exception when scm retry count field is
 empty. (#2433)

* [JENKINS-36387] Catch exception when scm retry count field is empty.

* Add test for JENKINS-36387

* [JENKINS-36387] Move test in correct place

* [JENKINS-36387] Reproduce actuall behaviour

(cherry picked from commit 439426236f52f905df782c1467c96c7bda8a746a)
---
 .../GlobalSCMRetryCountConfiguration.java     |  5 +-
 .../GlobalSCMRetryCountConfigurationTest.java | 70 +++++++++++++++++++
 2 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 test/src/test/java/jenkins/model/GlobalSCMRetryCountConfigurationTest.java

diff --git a/core/src/main/java/jenkins/model/GlobalSCMRetryCountConfiguration.java b/core/src/main/java/jenkins/model/GlobalSCMRetryCountConfiguration.java
index 43d1f06a3a..3e4d3afafa 100644
--- a/core/src/main/java/jenkins/model/GlobalSCMRetryCountConfiguration.java
+++ b/core/src/main/java/jenkins/model/GlobalSCMRetryCountConfiguration.java
@@ -24,6 +24,7 @@
 package jenkins.model;
 
 import hudson.Extension;
+import net.sf.json.JSONException;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.StaplerRequest;
@@ -49,6 +50,8 @@ public class GlobalSCMRetryCountConfiguration extends GlobalConfiguration {
             return true;
         } catch (IOException e) {
             throw new FormException(e,"quietPeriod");
+        } catch (JSONException e) {
+            throw new FormException(e.getMessage(), "quietPeriod");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/src/test/java/jenkins/model/GlobalSCMRetryCountConfigurationTest.java b/test/src/test/java/jenkins/model/GlobalSCMRetryCountConfigurationTest.java
new file mode 100644
index 0000000000..9ea926f264
--- /dev/null
+++ b/test/src/test/java/jenkins/model/GlobalSCMRetryCountConfigurationTest.java
@@ -0,0 +1,70 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2016
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package jenkins.model;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+import hudson.model.Descriptor;
+import net.sf.json.JSONObject;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.Issue;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.kohsuke.stapler.Stapler;
+
+/**
+ * Tests of {@link GlobalSCMRetryCountConfiguration}.
+ * @author Panagiotis Galatsanos
+ */
+public class GlobalSCMRetryCountConfigurationTest {
+    @Rule
+    public JenkinsRule j = new JenkinsRule();
+
+    @Test
+    @Issue("JENKINS-36387")
+    public void shouldExceptOnNullScmRetryCount() throws Exception {
+        try {
+            JSONObject json = new JSONObject();
+            GlobalSCMRetryCountConfiguration gc = (GlobalSCMRetryCountConfiguration)
+                    GlobalConfiguration.all().getDynamic("jenkins.model.GlobalSCMRetryCountConfiguration");
+
+            json.element("scmCheckoutRetryCount", 5);
+            gc.configure(Stapler.getCurrentRequest(), json);
+            assertThat("Wrong value, it should be equal to 5",
+                    j.getInstance().getScmCheckoutRetryCount(), equalTo(5));
+
+            json.element("scmCheckoutRetryCount", 3);
+            gc.configure(Stapler.getCurrentRequest(), json);
+            assertThat("Wrong value, it should be equal to 3",
+                    j.getInstance().getScmCheckoutRetryCount(), equalTo(3));
+
+            JSONObject emptyJson = new JSONObject();
+            gc.configure(Stapler.getCurrentRequest(), emptyJson);
+        } catch (Descriptor.FormException e) {
+            assertThat("Scm Retry count value changed! This shouldn't happen.",
+                    j.getInstance().getScmCheckoutRetryCount(), equalTo(3));
+        }
+    }
+}
-- 
GitLab