Fix quality flaw

2 files changed, 3 insertions, 2 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java
index 2a769e00665..8403037ada4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java
@@ -65,7 +65,6 @@ public class ComponentDao extends BaseDao<ComponentMapper, ComponentDto, String>
     return mapper(session).selectByUuid(uuid);
   }
 
-  @CheckForNull
   public ComponentDto getByUuid(DbSession session, String uuid) {
     ComponentDto componentDto = getNullableByUuid(session, uuid);
     if (componentDto == null) {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
index 4aa2bf7a3fd..9552473e5f1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
@@ -550,7 +550,9 @@ public class SearchAction extends SearchRequestHandler<IssueQuery, Issue> {
       projectsByComponentUuid.put(component.uuid(), Iterables.find(projects, new Predicate<ComponentDto>() {
         @Override
         public boolean apply(@Nullable ComponentDto input) {
-          return input != null && input.uuid().equals(component.projectUuid());
+          String uuid = input.uuid();
+          String projectUuid = input.projectUuid();
+          return input != null && uuid != null && projectUuid != null && uuid.equals(projectUuid);
         }
       }));
     }