Merge pull request eclipse-sw360#2401 from siemens/fix/api/project-co…

…ntroller fix(api): check project modifier before embedding Reviewed by: [email protected] Tested by: [email protected]
toshiba · Apr 12, 2024 · 770f097 · 770f097
2 parents a28f3ce + 6e36abb
commit 770f097
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectController.java b/...server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectController.java
@@ -2295,11 +2295,11 @@ public ResponseEntity<EntityModel<Project>> getAdministration(
     private void setAdditionalFieldsToHalResource(Project sw360Project, HalResource<Project> userHalResource) throws TException {
         try {
             User projectModifier = restControllerHelper.getUserByEmail(sw360Project.getModifiedBy());
-            if (projectModifier != null) {
+            if (projectModifier != null && projectModifier.getEmail() != null) {
                 restControllerHelper.addEmbeddedUser(userHalResource, projectModifier, "modifiedBy");
             }
             User projectOwner = restControllerHelper.getUserByEmail(sw360Project.getProjectOwner());
-            if (projectOwner != null) {
+            if (projectOwner != null && projectOwner.getEmail() != null) {
                 restControllerHelper.addEmbeddedUser(userHalResource, projectOwner, "projectOwner");
             }
             if (sw360Project.getSecurityResponsibles() == null || sw360Project.getSecurityResponsibles().isEmpty()) {
@@ -2315,7 +2315,7 @@ private void setAdditionalFieldsToHalResource(Project sw360Project, HalResource<
             if (sw360Project.getProjectResponsible() != null) {
                 restControllerHelper.addEmbeddedProjectResponsible(userHalResource,sw360Project.getProjectResponsible());
             }
-        }catch (Exception e) {
+        } catch (Exception e) {
             throw new TException(e.getMessage());
         }
     }