From 00e3d57e6bc60652fc683ec19a44f2c480a9af11 Mon Sep 17 00:00:00 2001
From: James Fredley <jamesfredley@users.noreply.github.com>
Date: Tue, 4 Mar 2025 16:58:41 -0500
Subject: [PATCH] Merge pull request #988 from dertalai/7.2.x

Fix java.lang.NullPointerException when incorrect schema in database.

(cherry picked from commit eff81e52091ee975706eeaad39d6263e66687b8c)
---
 .../org/grails/orm/hibernate/cfg/GrailsDomainBinder.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/grails-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java b/grails-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java
index 7aa35cf34..7f69b2f94 100644
--- a/grails-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java
+++ b/grails-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java
@@ -1505,15 +1505,15 @@ else if(tablePerConcreteClass) {
                 configureDerivedProperties(sub, subMapping);
             }
         }
-        Integer bs = m.getBatchSize();
+        Integer bs = (m == null) ? null : m.getBatchSize();
         if (bs != null) {
             subClass.setBatchSize(bs);
         }
 
-        if (m.getDynamicUpdate()) {
+        if (m != null && m.getDynamicUpdate()) {
             subClass.setDynamicUpdate(true);
         }
-        if (m.getDynamicInsert()) {
+        if (m != null && m.getDynamicInsert()) {
             subClass.setDynamicInsert(true);
         }