From db28a94eee60b0096390775565cdeec72337144d Mon Sep 17 00:00:00 2001 From: Nick Goupinets Date: Mon, 30 Nov 2020 09:09:38 -0500 Subject: [PATCH] Resolved alerts --- .../java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvc.java | 2 +- .../ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicate.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvc.java index 47b16277821..cf380d3cd93 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvc.java @@ -58,7 +58,7 @@ public class MdmResourceFilteringSvc { public boolean shouldBeProcessed(IAnyResource theResource) { //TODO GGG ask KHS: Skip the infinite loop, whoops. Better way to do this? tighter subscription criteria? if (MdmUtil.isMdmManaged(theResource)) { - ourLog.debug("MDM Message handler is dropping [{}] as it is MDM-managed."); + ourLog.debug("MDM Message handler is dropping [{}] as it is MDM-managed.", theResource); return false; } String resourceType = myFhirContext.getResourceType(theResource); diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicate.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicate.java index 5610f7e9409..8124c80a133 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicate.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicate.java @@ -63,6 +63,9 @@ public class PrimitiveTypeComparingPredicate implements BiPredicate { if (val1 == null && val2 != null) { return false; } + if (val1 != null && val2 == null) { + return false; + } Object actualVal1 = val1.getValue(); Object actualVal2 = val2.getValue();