From 853e3a00cc375526e85814a713c231543fc15910 Mon Sep 17 00:00:00 2001
From: Sanne Grinovero <sanne@hibernate.org>
Date: Mon, 13 Sep 2021 21:56:34 +0100
Subject: [PATCH] Avoid NPE on nameCache miss

---
 .../orm/runtime/schema/SchemaManagementIntegrator.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/schema/SchemaManagementIntegrator.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/schema/SchemaManagementIntegrator.java
index 7894da4a866300..4b98aa9808b719 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/schema/SchemaManagementIntegrator.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/schema/SchemaManagementIntegrator.java
@@ -47,8 +47,11 @@ public void integrate(Metadata metadata, SessionFactoryImplementor sessionFactor
 
     @Override
     public void disintegrate(SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
-        metadataMap.remove(nameCache.get(sessionFactory));
-        nameCache.remove(sessionFactory);
+        final String name = nameCache.get(sessionFactory);
+        if (name != null) {
+            metadataMap.remove(name);
+            nameCache.remove(sessionFactory);
+        }
     }
 
     public static void clearDsMap() {