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 NPEs loading invalid packages

This commit is contained in:
Grahame Grieve 2020-08-06 22:36:20 +10:00
parent f93f47ee24
commit 8b3ce7b3cc
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/BasePackageCacheManager.java vendored
View File

@ -128,6 +128,9 @@ public abstract class BasePackageCacheManager implements IPackageCacheManager {
} }
private String getPackageId(String canonical, String server) throws IOException { private String getPackageId(String canonical, String server) throws IOException {
if (canonical == null) {
return null;
}
PackageClient pc = myClientFactory.apply(server); PackageClient pc = myClientFactory.apply(server);
List<PackageClient.PackageInfo> res = pc.search(null, canonical, null, false); List<PackageClient.PackageInfo> res = pc.search(null, canonical, null, false);
if (res.size() == 0) { if (res.size() == 0) {

3
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/FilesystemPackageCacheManager.java vendored
View File

@ -544,6 +544,9 @@ public class FilesystemPackageCacheManager extends BasePackageCacheManager imple
// ========================= Package Mgmt API ======================================================================= // ========================= Package Mgmt API =======================================================================
private String getPackageIdFromBuildList(String canonical) throws IOException { private String getPackageIdFromBuildList(String canonical) throws IOException {
if (canonical == null) {
return null;
}
checkBuildLoaded(); checkBuildLoaded();
if (buildInfo != null) { if (buildInfo != null) {
for (JsonElement n : buildInfo) { for (JsonElement n : buildInfo) {