more NPE fixes

2020-02-24 12:17:34 +11:00 · 2020-02-24 12:17:34 +11:00 · 0bd6a4a7eb
parent a732847f58
commit 0bd6a4a7eb
1 changed files with 5 additions and 1 deletions
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
@ -758,7 +758,11 @@ public abstract class BaseWorkerContext implements IWorkerContext {
  @SuppressWarnings("unchecked")
  @Override
  public <T extends Resource> T fetchResourceWithException(Class<T> class_, String uri) throws FHIRException {
-       if (class_ == StructureDefinition.class)
+    if (uri == null) {
+      return null;
+    }
+   
+    if (class_ == StructureDefinition.class)
      uri = ProfileUtilities.sdNs(uri, getOverrideVersionNs());
    synchronized (lock) {