Fix some quality flaws

3 files changed, 5 insertions, 2 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityResultSetIterator.java b/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityResultSetIterator.java
index 9bb8cdd7b35..8a292c0e8f3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityResultSetIterator.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityResultSetIterator.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.server.activity.index;
 
+import org.apache.commons.io.Charsets;
 import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.action.update.UpdateRequest;
 import org.sonar.api.utils.KeyValueFormat;
@@ -80,7 +81,7 @@ class ActivityResultSetIterator extends ResultSetIterator<UpdateRequest> {
   protected UpdateRequest read(ResultSet rs) throws SQLException {
     ByteArrayOutputStream bytes = new ByteArrayOutputStream();
     // all the fields must be present, even if value is null
-    JsonWriter writer = JsonWriter.of(new OutputStreamWriter(bytes)).setSerializeNulls(true);
+    JsonWriter writer = JsonWriter.of(new OutputStreamWriter(bytes, Charsets.UTF_8)).setSerializeNulls(true);
     writer.beginObject();
     String key = rs.getString(1);
     writer.prop(ActivityIndexDefinition.FIELD_KEY, key);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceFileResultSetIterator.java b/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceFileResultSetIterator.java
index cf346eaf8b0..a662fa02207 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceFileResultSetIterator.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceFileResultSetIterator.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.server.source.index;
 
+import org.apache.commons.io.Charsets;
 import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.action.update.UpdateRequest;
 import org.sonar.api.utils.text.JsonWriter;
@@ -117,7 +118,7 @@ public class SourceFileResultSetIterator extends ResultSetIterator<SourceFileRes
       ByteArrayOutputStream bytes = new ByteArrayOutputStream();
 
       // all the fields must be present, even if value is null
-      JsonWriter writer = JsonWriter.of(new OutputStreamWriter(bytes)).setSerializeNulls(true);
+      JsonWriter writer = JsonWriter.of(new OutputStreamWriter(bytes, Charsets.UTF_8)).setSerializeNulls(true);
       writer.beginObject();
       writer.prop(SourceLineIndexDefinition.FIELD_PROJECT_UUID, projectUuid);
       writer.prop(SourceLineIndexDefinition.FIELD_FILE_UUID, fileUuid);
diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/DateCollectorTest.java b/server/sonar-server/src/test/java/org/sonar/server/util/DateCollectorTest.java
index da7369eee7f..9b7a28d8859 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/util/DateCollectorTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/util/DateCollectorTest.java
@@ -36,6 +36,7 @@ public class DateCollectorTest {
   @Test
   public void max() throws Exception {
     collector.add(DateUtils.parseDate("2013-06-01"));
+    collector.add(null);
     collector.add(DateUtils.parseDate("2014-01-01"));
     collector.add(DateUtils.parseDate("2013-08-01"));