Merge pull request #301 from beaker-project/JENKINS-38974-commentText…

…ParameterMode-NPE [JENKINS-38974] fill in commentTextParameterMode if it's missing
jenkinsci · Nov 25, 2016 · 579b5bd · 579b5bd
2 parents 166b26c + 814b85b
commit 579b5bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/...main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java b/...main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java
@@ -1852,6 +1852,9 @@ public Object readResolve() throws ObjectStreamException {
         if (changeSubjectParameterMode == null) {
             changeSubjectParameterMode = GerritTriggerParameters.ParameterMode.PLAIN;
         }
+        if (commentTextParameterMode == null) {
+            commentTextParameterMode = GerritTriggerParameters.ParameterMode.PLAIN;
+        }
         return super.readResolve();
     }
     /*

diff --git a/...t/java/com/sonyericsson/hudson/plugins/gerrit/trigger/spec/BackCompat2173JenkinsTest.java b/...t/java/com/sonyericsson/hudson/plugins/gerrit/trigger/spec/BackCompat2173JenkinsTest.java
@@ -106,6 +106,8 @@ private void verifyAllOff(GerritTrigger trigger) {
         //Setting introduced after the version under test, so it should have the default value
         assertSame("Change subject mode == PLAIN", GerritTriggerParameters.ParameterMode.PLAIN,
                 trigger.getChangeSubjectParameterMode());
+        assertSame("Comment text mode == PLAIN", GerritTriggerParameters.ParameterMode.PLAIN,
+                trigger.getCommentTextParameterMode());
         assertEquals(GerritServer.ANY_SERVER, trigger.getServerName());
 
         assertThat(trigger.getGerritProjects(), hasItem(