SONAR-1450: Fix NPE in NewViolationsDecorator

2 files changed, 7 insertions, 3 deletions

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewViolationsDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewViolationsDecorator.java
index aa7c2ec1156..d64935cf3a3 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewViolationsDecorator.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewViolationsDecorator.java
@@ -55,9 +55,11 @@ public class NewViolationsDecorator implements Decorator {
   public void decorate(Resource resource, DecoratorContext context) {
     Measure measure = new Measure(CoreMetrics.NEW_VIOLATIONS);
     for (int index = 0; index < 3; index++) {
-      int days = timeMachineConfiguration.getDiffPeriodInDays(index);
-      double value = calculate(context, days) + sumChildren(context, index);
-      setDiffValue(measure, index, value);
+      Integer days = timeMachineConfiguration.getDiffPeriodInDays(index);
+      if (days != null) {
+        double value = calculate(context, days) + sumChildren(context, index);
+        setDiffValue(measure, index, value);
+      }
     }
     context.saveMeasure(measure);
   }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/Violation.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/Violation.java
index 6b8eaa7fe3e..67333a56f50 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/Violation.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/Violation.java
@@ -159,6 +159,8 @@ public class Violation {
   }
 
   /**
+   * For internal use only
+   * 
    * @since 2.5
    */
   public Violation setCreatedAt(Date createdAt) {