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

Merge pull request #1829 from hapifhir/2024-11-gg-validator-npe 

fix NPE in validator around Extension context
This commit is contained in:
Grahame Grieve 2024-11-25 15:00:20 +11:00 committed by GitHub
parent b51951717d 9835bea27d
commit a5e0605a16
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE_NOTES.md
View File

@ -1,6 +1,6 @@
## Validator Changes ## Validator Changes
* no changes * fix NPE in validator around Extension context
## Other code changes ## Other code changes

6
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java
View File

@ -2478,8 +2478,11 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
} }
if (ctxt.getType() == ExtensionContextType.ELEMENT) { if (ctxt.getType() == ExtensionContextType.ELEMENT) {
String en = ctxt.getExpression(); String en = ctxt.getExpression();
contexts.append("e:" + en);
String pu = null; String pu = null;
if (en == null) {
// nothing? It's an error in the extension definition, but that's properly reported elsewhere
} else {
contexts.append("e:" + en);
if (en.contains("#")) { if (en.contains("#")) {
pu = en.substring(0, en.indexOf("#")); pu = en.substring(0, en.indexOf("#"));
en = en.substring(en.indexOf("#")+1); en = en.substring(en.indexOf("#")+1);
@ -2495,6 +2498,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
} else if (hasElementName(plist, en) && pu == null) { } else if (hasElementName(plist, en) && pu == null) {
ok = true; ok = true;
} }
}
if (!ok) { if (!ok) {
if (checkConformsToProfile(appContext, errors, resource, container, stack, extUrl, ctxt.getExpression(), pu)) { if (checkConformsToProfile(appContext, errors, resource, container, stack, extUrl, ctxt.getExpression(), pu)) {