Merge pull request #3532 from atlanhq/hr-audit-listener-npe-fix-ssb-beta

fixed logging in NPE
atlanhq · Sep 19, 2024 · 96a12b8 · 96a12b8
2 parents 47e737b + 51cd5d3
commit 96a12b8
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/repository/src/main/java/org/apache/atlas/repository/audit/EntityAuditListenerV2.java b/repository/src/main/java/org/apache/atlas/repository/audit/EntityAuditListenerV2.java
@@ -875,7 +875,12 @@ private void getClassificationTextFromEntity(List<AtlasClassification> classific
                     Objects.isNull(classification) ||
                     Objects.isNull(entity.getGuid()) ||
                     Objects.isNull(classification.getEntityGuid())) {
-                LOG.info("Probable NPE prevented : Entity {}, classification : {}, entity : {}, entity.Guid : {}, classification.getEntityGuid : {}", entity.toString(), classification.toString(), entity.getGuid(), classification.getEntityGuid());
+                LOG.info("Probable NPE prevented : Entity {}, classification : {}, entity.Guid : {}, classification.getEntityGuid : {}",
+                        entity != null ? entity.toString() : "null",
+                        classification != null ? classification.toString() : "null",
+                        entity != null && entity.getGuid() != null ? entity.getGuid() : "null",
+                        classification != null && classification.getEntityGuid() != null ? classification.getEntityGuid() : "null");
+
                 continue;
             }
             if (entity.getGuid().equals(classification.getEntityGuid())) {