From a985831d766d7e8b389a9053643f4c035f8a383e Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.com>
Date: Wed, 22 Jul 2020 07:02:15 +1000
Subject: [PATCH] efficiency cleanup

---
 .../java/org/hl7/fhir/r5/context/CanonicalResourceManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/CanonicalResourceManager.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/CanonicalResourceManager.java
index 465bffcee..ec05e64b8 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/CanonicalResourceManager.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/CanonicalResourceManager.java
@@ -121,6 +121,7 @@ public class CanonicalResourceManager<T extends CanonicalResource> {
         synchronized (this) {
           resource = res;
         }
+        proxy = null;
       }
       return resource;
     }
@@ -206,7 +207,7 @@ public class CanonicalResourceManager<T extends CanonicalResource> {
     if (cr.getPackageInfo() != null && cr.getPackageInfo().getId().startsWith("hl7.terminology")) {
       List<CachedCanonicalResource<T>> toDrop = new ArrayList<>();
       for (CachedCanonicalResource<T> n : list) {
-        if (n.getUrl().equals(cr.getUrl()) && isBasePackage(n.getPackageInfo())) {
+        if (n.getUrl() != null && n.getUrl().equals(cr.getUrl()) && isBasePackage(n.getPackageInfo())) {
           toDrop.add(n);
         }
       }