honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the server exception when validating an invalid local reference 

'fetcher == null' is ok for a local reference.

Unfortunately, there are now two messages with the same meaning:
- one from the ProfileValidation
- one from the code in this location
This commit is contained in:
Heinz-Dieter Conradi 2018-03-01 10:48:30 +01:00 committed by Heinz-Dieter Conradi
parent f2cd05fe3b
commit b2107baae4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hapi-fhir-validation/src/main/java/org/hl7/fhir/r4/validation/InstanceValidator.java
View File

@ -1563,9 +1563,12 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
if (pol.checkExists()) { if (pol.checkExists()) {
if (we == null) { if (we == null) {
if (fetcher == null) if (fetcher == null) {
throw new FHIRException("Resource resolution services not provided"); if (!refType.equals("contained"))
we = fetcher.fetch(hostContext.appContext, ref); throw new FHIRException("Resource resolution services not provided");
} else {
we = fetcher.fetch(hostContext.appContext, ref);
}
} }
rule(errors, IssueType.STRUCTURE, element.line(), element.col(), path, we != null, "Unable to resolve resource '"+ref+"'"); rule(errors, IssueType.STRUCTURE, element.line(), element.col(), path, we != null, "Unable to resolve resource '"+ref+"'");
} }