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

fix NPE setting locale

This commit is contained in:
Grahame Grieve 2022-01-13 05:14:36 +11:00
parent 7d3f34b0ca
commit c661dae9f5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ResourceUtilities.java
View File

@ -147,7 +147,10 @@ public class ResourceUtilities {
if (cc.hasCoding("http://unstats.un.org/unsd/methods/m49/m49.htm", "001")) { if (cc.hasCoding("http://unstats.un.org/unsd/methods/m49/m49.htm", "001")) {
return new Locale("en-US"); 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); String l = jl.get(c);
if (l == null) { if (l == null) {
return null; return null;

2
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/SimpleHTTPClient.java
View File

@ -110,7 +110,7 @@ public class SimpleHTTPClient {
public HTTPResult get(String url, String accept) throws IOException { public HTTPResult get(String url, String accept) throws IOException {
URL u = new URL(url); 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 // handling redirects - setInstanceFollowRedirects(true) doesn't handle crossing http to https