SONAR-6262 Fix NPE in link publisher on Views

1 files changed, 6 insertions, 1 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/ComponentsPublisher.java b/sonar-batch/src/main/java/org/sonar/batch/report/ComponentsPublisher.java
index 186f4368d6e..06f5998bb7d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/report/ComponentsPublisher.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/report/ComponentsPublisher.java
@@ -91,7 +91,7 @@ public class ComponentsPublisher implements ReportPublisher {
     for (BatchResource child : batchResource.children()) {
       builder.addChildRefs(child.batchId());
     }
-    if (ResourceUtils.isProject(r)) {
+    if (isRealProjectOrModule(r)) {
       ProjectDefinition def = getProjectDefinition(reactor, r.getKey());
       ComponentLink.Builder linkBuilder = ComponentLink.newBuilder();
 
@@ -108,6 +108,11 @@ public class ComponentsPublisher implements ReportPublisher {
     }
   }
 
+  // Exclude views
+  private static boolean isRealProjectOrModule(Resource r) {
+    return ResourceUtils.isProject(r) && !ResourceUtils.isView(r) && !ResourceUtils.isSubview(r);
+  }
+
   private ProjectDefinition getProjectDefinition(ProjectReactor reactor, String keyWithBranch) {
     for (ProjectDefinition p : reactor.getProjects()) {
       if (keyWithBranch.equals(p.getKeyWithBranch())) {