From 6d2e2075c934c4088c60c43daf6a0bf3f2dd7b1e Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.com>
Date: Tue, 29 Jan 2019 21:46:02 +1100
Subject: [PATCH] fix bug validating unknown code system

---
 .../hl7/fhir/r4/context/BaseWorkerContext.java   |   3 ++-
 r4 test resources.lnk                            | Bin 0 -> 1683 bytes
 validation test resources.lnk                    | Bin 0 -> 1757 bytes
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 r4 test resources.lnk
 create mode 100644 validation test resources.lnk

diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/context/BaseWorkerContext.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/context/BaseWorkerContext.java
index e2fdf9c86..cee43d1ff 100644
--- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/context/BaseWorkerContext.java
+++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/context/BaseWorkerContext.java
@@ -39,6 +39,7 @@ import org.hl7.fhir.r4.conformance.ProfileUtilities;
 import org.hl7.fhir.r4.context.TerminologyCache.CacheToken;
 import org.hl7.fhir.r4.model.BooleanType;
 import org.hl7.fhir.r4.model.CodeSystem;
+import org.hl7.fhir.r4.model.CodeSystem.CodeSystemContentMode;
 import org.hl7.fhir.r4.model.CodeSystem.ConceptDefinitionComponent;
 import org.hl7.fhir.r4.model.CodeableConcept;
 import org.hl7.fhir.r4.model.Coding;
@@ -285,7 +286,7 @@ public abstract class BaseWorkerContext implements IWorkerContext {
   @Override
   public boolean supportsSystem(String system) throws TerminologyServiceException {
     synchronized (lock) {
-      if (codeSystems.containsKey(system))
+      if (codeSystems.containsKey(system) && codeSystems.get(system).getContent() != CodeSystemContentMode.NOTPRESENT)
         return true;
       else if (supportedCodeSystems.contains(system))
         return true;
diff --git a/r4 test resources.lnk b/r4 test resources.lnk
new file mode 100644
index 0000000000000000000000000000000000000000..9a6787c01a59be073a6ab99ef19689882dbf1cab
GIT binary patch
literal 1683
zcmc&!ZAg<*6h2Ootf<#qVWPPtKcbuy%%!!O&X2X$JK0nUU%|BxH*>x64$&Vb{f$--
zBm|~J=`8!81=_E~pg-ZCAtfplLKIY(2_gNc?3{P+K8&e9yYQTQ?z!jdo_p>!0ziUX
zh7@2@q)>Aewg7|ty>~PBZ#;aHFg`u?_V%;r42qCqLTHN6fJ_eAbql7T;!C-kxjVZB
z4yjZFd!a~I&P9}>3=75LBA>OiFwn&d7XZp31(INC;=A#3BFUAgvHCF)X@1mD<m~F#
z&;>jQfMy^Er{t}Oo!Z8L$y}>9s(Xu-HTqKkhKSd+r?gLAeL^zQe~(bGa!&Nw3QBN6
zJE(DXBIm|90GZGsMbWT{hL|WilNq31ic-j${j^U}7U%aPtw6*M!EawTiV|$%o&yas
zp-qZ+oMjth;+adJE)uQDPrDTD*I_Nv&}AYcjSoD(K{NqMP%i^(6uON<w#m<cSFpj+
zm<S}L2!G;6m^)DlUaXJ}HFiPxUJKdLF$O$V_r>VFk{^<juhqD|n$P!u2dr3eG{bx4
zq`XSmfhP=@t1YGmb1$Y^70GUNjP}UmR3&xFc0}wjBzI$O4$P2;PBBa30n!ouh)e|8
z(OiU}dekG*5G2p`sq^SLm@FVRvI2Rku^bT^GT^vcbA`U*Of{zyJDKB!R;8<5t#rEF
z!kUHB#tV+M5}|~{dUI4MPH=enPQm8z!U1eOZj+1Sq_T67l5ug4+Jaf)LGGND(rp#2
zE~|$cEHpkbCr!uR=ji*j)+3E&*B2Hpm1!JVpHn9sgX6*RAAOtcpT=sWp#K26E4I{G
z7F93ib#SG2<YzE#$m`7ML%E$oWg{vP;rmrU0qF3}bCH+4{(;xuiN2VPbg0k6<vK{o
z;JAsPgjLJA&zEX5nBiqvi*NAjqg<44B?U^Dn0W288|6C@pcRSb0ezL^If>R}NsU;8
zjogmSr@(K7N6wBseI;bQ10h<6KUiA7L{LutHd}$FZ#s2s1}05&>A_)??;{2BY(V^v
z!fo7VlpR1Bf({Va<EeUltwTSe*D8lJ-M%c8yGTKgnEkf$n|(EFywxS^X%6HykUTv8
E0@4dqcmMzZ

literal 0
HcmV?d00001

diff --git a/validation test resources.lnk b/validation test resources.lnk
new file mode 100644
index 0000000000000000000000000000000000000000..20bb98b08b2b906e75677cfb5642f177f1e17196
GIT binary patch
literal 1757
zcmd5+O-NKx6h4j;YGGqqR#=+kPo+<VV$u?o@n@3hjm@YOzQAE-bf(lNZ^oZRMJ*!>
zf&?S7D78fe38|~hs7<&ri7*#tiwX-fA*4;zci#LOqtUJl-?`_WbMN`R_Zo>PB2fcM
zG_F#rxJ1#U1wY^Q_`!wyuOpf~Q&%0M!C6&8AK~2}pwBgllu|usnoRv%=+fSqj;4Ki
zc{jIFuD(zTYzi_W<*SQK(bAx$PFXokR7f!tMT=wKjOQa+E?~#650Rjm!GkJi*S(}p
zl1U*PqeN=-S<4kC)@#XRt~3~R=kkRL!x5sYfYpRYtY@p;$~w?LQ^;CAq1tRBft=J#
zI?RpWT<}AbOl>|dMPgi4h!?%dOjP6Zk|UZ2S<hY;W_E#=0->WYV|N5c9?pwEHZ=kV
z4kXhVpTB(Z{gn`Zb)`n4hJe5NLDsXs?A#JiZ#%*GM(nkBt7auo2U(G+i|m*^m}P3k
zxnxw$+n*e<eo#wp#YP81JhGHM3Sm7anfH<#8QQR86Zt#swd8TQJ;6@1%x|lBRa+i%
zz#fjF(~>W)!{XVeS~8bgOtt272(>IEI@WP?$HH2?-Zz2R*rH7BYLv_qZ3XTE$pGIu
zo^yfyKn;)puso$(m%$IjWFhrxr-J92Cj#D~AxWw<ml{fsmP>l|ZcDP#BsiOOLZj2A
ztXK#(S#hkCbXc2RcB{uFw@RqH#1)eihg)t}Yz{YN<5Eih*igyW4hco{mQo5+f(As7
z1aBYrrO~8Voz@n<ir(>2TWmTsn`XFCVm(k-aAmG{D(Ta$wE6fkN8iZg$oHPV=})6d
zF|hv(=JGAomW8}0GkUsMdGE($LchB)Z2)pRyGjA70DrKlltp^{4pQLFuU>%FHNm&F
z)}C<h!C$^T92~|qfD_1DN*`UU+^!v1(lm7UeR+@$c`R?>1eghT%{D{65ug$#6SL|k
z%a)^f%_lbi6?lrx=v68{AQ_w;JbyxbIu1}z`@d#hzXCX>!Be)ZqMoVv;WspHdb@RU
z81kLGfi2^o`Y#H(_C4fii3$KtXlP4I*~80ihI@t*p}(lBdk5rB-e3Txzb^k2UrZZ&
PJ2huc4rSD`+&_K;F{)!6

literal 0
HcmV?d00001