fix for GRAILS-5156 and GRAILS-5158

Author: graemerocher

src/groovy/org/codehaus/groovy/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.groovy

@@ -137,12 +137,11 @@ class ClosureEventTriggeringInterceptor extends SaveOrUpdateEventListener implem
                 event.getState()[ArrayUtils.indexOf(event.persister.propertyNames, GrailsDomainClassProperty.LAST_UPDATED)] = now;
                 entity."$property.name" = now
             }
+            if(!entity.validate(deepValidate:false)) {
+                result = true
+            }
         }
 
-
-        if(!entity.validate(deepValidate:false)) {
-            result = true
-        }
         return result
     }
 

src/persistence/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsAnnotationConfiguration.java

@@ -99,24 +99,23 @@ public SessionFactory buildSessionFactory() throws HibernateException {
      *  domain classes
      */
     protected void secondPassCompile() throws MappingException {
-        if (configLocked) {
-            return;
-        }
-        if(LOG.isDebugEnabled()) {
-        	LOG.debug("[GrailsAnnotationConfiguration] [" + this.domainClasses.size() + "] Grails domain classes to bind to persistence runtime");
-		}
+        if (!configLocked) {
+            if(LOG.isDebugEnabled()) {
+                LOG.debug("[GrailsAnnotationConfiguration] [" + this.domainClasses.size() + "] Grails domain classes to bind to persistence runtime");
+            }
 
-        // do Grails class configuration
-        for (GrailsDomainClass domainClass : this.domainClasses) {
-            GrailsDomainBinder.evaluateMapping(domainClass);
-        }
+            // do Grails class configuration
+            for (GrailsDomainClass domainClass : this.domainClasses) {
+                GrailsDomainBinder.evaluateMapping(domainClass);
+            }
 
-        // do Grails class configuration
-        for (GrailsDomainClass domainClass : this.domainClasses) {          
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("[GrailsAnnotationConfiguration] Binding persistent class [" + domainClass.getFullName() + "]");
+            // do Grails class configuration
+            for (GrailsDomainClass domainClass : this.domainClasses) {
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug("[GrailsAnnotationConfiguration] Binding persistent class [" + domainClass.getFullName() + "]");
+                }
+                GrailsDomainBinder.bindClass(domainClass, super.createMappings());
             }
-            GrailsDomainBinder.bindClass(domainClass, super.createMappings());
         }
 
         // call super