Fix reloading of measure data

2 files changed, 6 insertions, 1 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/MeasurePersister.java b/sonar-batch/src/main/java/org/sonar/batch/index/MeasurePersister.java
index a03c6c90369..54da51497f0 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/index/MeasurePersister.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/index/MeasurePersister.java
@@ -90,7 +90,9 @@ public final class MeasurePersister {
       return update(measure, snapshot);
     }
     if (shouldPersistMeasure(resource, measure)) {
-      return insert(measure, snapshot);
+      MeasureModel insert = insert(measure, snapshot);
+      measure.setId(insert.getId());
+      return insert;
     }
     return null;
   }
diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/MeasurePersisterTest.java b/sonar-batch/src/test/java/org/sonar/batch/index/MeasurePersisterTest.java
index c59dc0e7613..240248427a2 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/index/MeasurePersisterTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/index/MeasurePersisterTest.java
@@ -84,6 +84,7 @@ public class MeasurePersisterTest extends AbstractDaoTestCase {
 
     checkTables("shouldInsertMeasure", "project_measures");
     verify(memoryOptimizer).evictDataMeasure(eq(measure), any(MeasureModel.class));
+    assertThat(measure.getId()).isNotNull();
   }
 
   @Test
@@ -106,6 +107,7 @@ public class MeasurePersisterTest extends AbstractDaoTestCase {
     measurePersister.saveMeasure(project, measure);
 
     checkTables("shouldInsertRuleMeasure", "project_measures");
+    assertThat(measure.getId()).isNotNull();
   }
 
   @Test
@@ -120,6 +122,7 @@ public class MeasurePersisterTest extends AbstractDaoTestCase {
     ArgumentCaptor<MeasureModel> validMeasureModel = ArgumentCaptor.forClass(MeasureModel.class);
     verify(memoryOptimizer).evictDataMeasure(eq(withLargeData), validMeasureModel.capture());
     assertThat(validMeasureModel.getValue().getMeasureData().getId()).isNotNull();
+    assertThat(withLargeData.getId()).isNotNull();
   }
 
   @Test