diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ResourceUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ResourceUtilities.java index 0bb1b67e4..04d83ff7e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ResourceUtilities.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ResourceUtilities.java @@ -147,7 +147,10 @@ public class ResourceUtilities { if (cc.hasCoding("http://unstats.un.org/unsd/methods/m49/m49.htm", "001")) { return new Locale("en-US"); } - String c = cc.getCode("urn:iso:std:iso:3166:-2"); + String c = cc.getCode("urn:iso:std:iso:3166"); + if (c == null) { + return null; + } String l = jl.get(c); if (l == null) { return null; diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/SimpleHTTPClient.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/SimpleHTTPClient.java index 318affc26..e61de56b8 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/SimpleHTTPClient.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/SimpleHTTPClient.java @@ -110,7 +110,7 @@ public class SimpleHTTPClient { public HTTPResult get(String url, String accept) throws IOException { URL u = new URL(url); - boolean isSSL = url.startsWith("https://"); +// boolean isSSL = url.startsWith("https://"); // handling redirects - setInstanceFollowRedirects(true) doesn't handle crossing http to https