From 236b43a970f3a8477db07927b22554a93bc529d7 Mon Sep 17 00:00:00 2001
From: Benoit <43733395+benoit-sns@users.noreply.github.com>
Date: Wed, 10 Oct 2018 11:46:43 +0000
Subject: [PATCH] SONAR-11279 Prevent null change to be added to DefaultIssue
 (#791)

---
 .../src/main/java/org/sonar/core/issue/DefaultIssue.java | 5 ++++-
 .../test/java/org/sonar/core/issue/DefaultIssueTest.java | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java
index ff87e287641..a0e59a741da 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java
@@ -514,7 +514,10 @@ public class DefaultIssue implements Issue, Trackable, org.sonar.api.ce.measure.
     return currentChange;
   }
 
-  public DefaultIssue addChange(FieldDiffs change) {
+  public DefaultIssue addChange(@Nullable FieldDiffs change) {
+    if (change == null) {
+      return this;
+    }
     if (changes == null) {
       changes = new ArrayList<>();
     }
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java
index 01d8ad8b04c..65eff089c61 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java
@@ -212,4 +212,13 @@ public class DefaultIssueTest {
 
     assertThat(issue.changes()).hasSize(1);
   }
+
+  @Test
+  public void adding_null_change_has_no_effect() {
+    DefaultIssue issue = new DefaultIssue();
+
+    issue.addChange(null);
+
+    assertThat(issue.changes()).hasSize(0);
+  }
 }
-- 
2.39.5