honeymoose/hapi-fhir
1
0
Fork 0
mirror of https://github.com/hapifhir/hapi-fhir.git synced 2025-02-16 18:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolved alerts

Browse Source
This commit is contained in:
Nick Goupinets 2020-11-30 09:09:38 -05:00
parent da3df49089
commit db28a94eee
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvc.java
View File

@ -58,7 +58,7 @@ public class MdmResourceFilteringSvc {
public boolean shouldBeProcessed(IAnyResource theResource) { public boolean shouldBeProcessed(IAnyResource theResource) {
//TODO GGG ask KHS: Skip the infinite loop, whoops. Better way to do this? tighter subscription criteria? //TODO GGG ask KHS: Skip the infinite loop, whoops. Better way to do this? tighter subscription criteria?
if (MdmUtil.isMdmManaged(theResource)) { 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; return false;
} }
String resourceType = myFhirContext.getResourceType(theResource); String resourceType = myFhirContext.getResourceType(theResource);

3
hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicate.java
View File

@ -63,6 +63,9 @@ public class PrimitiveTypeComparingPredicate implements BiPredicate {
if (val1 == null && val2 != null) { if (val1 == null && val2 != null) {
return false; return false;
} }
if (val1 != null && val2 == null) {
return false;
}
Object actualVal1 = val1.getValue(); Object actualVal1 = val1.getValue();
Object actualVal2 = val2.getValue(); Object actualVal2 = val2.getValue();