Do not return empty array of locations in WS

1 files changed, 15 insertions, 13 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ModuleIssues.java b/sonar-batch/src/main/java/org/sonar/batch/issue/ModuleIssues.java
index 9db7fd69fde..f8ade4d0702 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/ModuleIssues.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/issue/ModuleIssues.java
@@ -109,21 +109,23 @@ public class ModuleIssues {
 
   private void applyFlows(Issue issue) {
     for (Flow flow : issue.flows()) {
-      flowBuilder.clear();
-      for (org.sonar.api.batch.sensor.issue.IssueLocation location : flow.locations()) {
-        locationBuilder.clear();
-        locationBuilder.setComponentRef(componentCache.get(location.inputComponent()).batchId());
-        String message = location.message();
-        if (message != null) {
-          locationBuilder.setMsg(message);
+      if (!flow.locations().isEmpty()) {
+        flowBuilder.clear();
+        for (org.sonar.api.batch.sensor.issue.IssueLocation location : flow.locations()) {
+          locationBuilder.clear();
+          locationBuilder.setComponentRef(componentCache.get(location.inputComponent()).batchId());
+          String message = location.message();
+          if (message != null) {
+            locationBuilder.setMsg(message);
+          }
+          TextRange textRange = location.textRange();
+          if (textRange != null) {
+            locationBuilder.setTextRange(toProtobufTextRange(textRange));
+          }
+          flowBuilder.addLocation(locationBuilder.build());
         }
-        TextRange textRange = location.textRange();
-        if (textRange != null) {
-          locationBuilder.setTextRange(toProtobufTextRange(textRange));
-        }
-        flowBuilder.addLocation(locationBuilder.build());
+        builder.addFlow(flowBuilder.build());
       }
-      builder.addFlow(flowBuilder.build());
     }
   }