From d6c2cbb3e07dd8e3611ca868df5df591f043c8c7 Mon Sep 17 00:00:00 2001
From: dotasek <david.otasek@smilecdr.com>
Date: Mon, 9 Sep 2024 17:09:24 -0400
Subject: [PATCH] Cherry pick core version bump to 6.3.23

---
 .../ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java     | 4 ++--
 pom.xml                                                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java
index d7f6f5da0b4..122caf5b490 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java
@@ -588,8 +588,8 @@ public class PackageInstallerSvcImpl implements IPackageInstallerSvc {
 		if (statusTypes.isEmpty()) {
 			return true;
 		}
-		// Resource has a null status field
-		if (statusTypes.get(0).getValue() == null) {
+		// Resource has no status field, or an explicitly null one
+		if (!statusTypes.get(0).hasValue() || statusTypes.get(0).getValue() == null) {
 			return false;
 		}
 		// Resource has a status, and we need to check based on type
diff --git a/pom.xml b/pom.xml
index bbcf35907cf..828bfa316ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -938,7 +938,7 @@
 	</licenses>
 
 	<properties>
-		<fhir_core_version>6.3.11</fhir_core_version>
+		<fhir_core_version>6.3.23</fhir_core_version>
 		<spotless_version>2.41.1</spotless_version>
 		<surefire_jvm_args>-Dfile.encoding=UTF-8 -Xmx2048m</surefire_jvm_args>