Merge pull request #2547 from siemens/fix/summaryAdministration-1607

fix(rest): Added code to resolve the server error while fetching a summaryAdministraion endpoint. Reviewed-by: mishra.gaurav@siemens.com Tested-by: mishra.gaurav@siemens.com
eclipse-sw360 · Sep 2, 2024 · 4795b4c · 4795b4c
2 parents 4d902af + 51fabdf
commit 4795b4c
Showing 1 changed file with 12 additions and 6 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
@@ -2485,13 +2485,19 @@ 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 && projectModifier.getEmail() != null) {
-                restControllerHelper.addEmbeddedUser(userHalResource, projectModifier, "modifiedBy");
+            String modifiedByEmail = sw360Project.getModifiedBy();
+            if (modifiedByEmail != null) {
+                User projectModifier = restControllerHelper.getUserByEmail(modifiedByEmail);
+                if (projectModifier != null) {
+                    restControllerHelper.addEmbeddedUser(userHalResource, projectModifier, "modifiedBy");
+                }
             }
-            User projectOwner = restControllerHelper.getUserByEmail(sw360Project.getProjectOwner());
-            if (projectOwner != null && projectOwner.getEmail() != null) {
-                restControllerHelper.addEmbeddedUser(userHalResource, projectOwner, "projectOwner");
+            String projectOwnerEmail = sw360Project.getProjectOwner();
+            if (projectOwnerEmail != null) {
+                User projectOwner = restControllerHelper.getUserByEmail(sw360Project.getProjectOwner());
+                if (projectOwner != null) {
+                    restControllerHelper.addEmbeddedUser(userHalResource, projectOwner, "projectOwner");
+                }
             }
             if (sw360Project.getSecurityResponsibles() == null || sw360Project.getSecurityResponsibles().isEmpty()) {
                 sw360Project.setSecurityResponsibles(new HashSet<String>(){{add("");}});