Merge pull request #2436 from Siemens-Healthineers/fix/pkgUpdationCau…

…singInconsistency-2428 fix(importCDX) : Fix package's linked release updation when an SBOM is imported Reviewed by: [email protected] Tested by: [email protected]
eclipse-sw360 · May 17, 2024 · c0150b3 · c0150b3
2 parents 883571a + dfabecd
commit c0150b3
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/cyclonedx/CycloneDxBOMImporter.java b/backend/src-common/src/main/java/org/eclipse/sw360/cyclonedx/CycloneDxBOMImporter.java
@@ -647,10 +647,12 @@ private Map<String, String> importAllComponentsAsPackages(Map<String, List<org.c
                             pkg.setId(pkgAddSummary.getId());
                             if (AddDocumentRequestStatus.DUPLICATE.equals(pkgAddSummary.getRequestStatus())) {
                                 Package dupPkg = packageDatabaseHandler.getPackageById(pkg.getId());
-                                if (!release.getId().equals(dupPkg.getReleaseId())) {
-                                    log.error("Release Id of Package from BOM: '%s' and Database: '%s' is not equal!", release.getId(), dupPkg.getReleaseId());
-                                    dupPkg.setReleaseId(release.getId());
+                                String dupPkgReleaseId = dupPkg.getReleaseId();
+                                String releaseId = release.getId();
+                                if (!releaseId.equals(dupPkgReleaseId) && CommonUtils.isNullEmptyOrWhitespace(dupPkgReleaseId)) {
+                                    dupPkg.setReleaseId(releaseId);
                                     packageDatabaseHandler.updatePackage(dupPkg, user);
+                                    log.error("Release Id of Package from BOM: '%s' and Database: '%s' is not equal!", releaseId, dupPkgReleaseId);
                                 }
                                 if(!CommonUtils.nullToEmptySet(project.getPackageIds()).contains(pkg.getId())){
                                     pkgReuseCount++;