Merge pull request #20173 from Sanne/SchemaManagementIntegration

quarkusio · Sep 15, 2021 · 72abfe4 · 72abfe4
2 parents 6f60959 + 63b3277
commit 72abfe4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...ime/src/main/java/io/quarkus/hibernate/orm/runtime/schema/SchemaManagementIntegrator.java b/...ime/src/main/java/io/quarkus/hibernate/orm/runtime/schema/SchemaManagementIntegrator.java
@@ -47,8 +47,10 @@ 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.remove(sessionFactory);
+        if (name != null) {
+            metadataMap.remove(name);
+        }
     }
 
     public static void clearDsMap() {