From 480f71a609487df100fa93590dbf4e3096047849 Mon Sep 17 00:00:00 2001
From: Kazuki YAMAMOTO <yam.kazuki@gmail.com>
Date: Tue, 3 Sep 2013 21:53:36 +0900
Subject: [PATCH] GRAILS-9922 - After a test of validation error, another test
 of delete() was failed

---
 .../hibernate/HibernateGormInstanceApi.groovy  | 18 +++++++-----------
 .../hibernate/HibernateGormInstanceApi.groovy  | 18 +++++++-----------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/grails-datastore-gorm-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/HibernateGormInstanceApi.groovy b/grails-datastore-gorm-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/HibernateGormInstanceApi.groovy
index 12bb9e39a..f73d6165e 100644
--- a/grails-datastore-gorm-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/HibernateGormInstanceApi.groovy
+++ b/grails-datastore-gorm-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/HibernateGormInstanceApi.groovy
@@ -210,10 +210,9 @@ class HibernateGormInstanceApi<D> extends AbstractHibernateGormInstanceApi<D> {
 
     @Override
     void delete(D instance) {
-        def obj = instance
         boolean flush = shouldFlush()
         try {
-            instanceApiHelper.delete obj, flush
+            instanceApiHelper.delete instance, flush
         }
         catch (DataAccessException e) {
             handleDataAccessException(hibernateTemplate, e)
@@ -222,15 +221,12 @@ class HibernateGormInstanceApi<D> extends AbstractHibernateGormInstanceApi<D> {
 
     @Override
     void delete(D instance, Map params) {
-        def obj = instance
-        hibernateTemplate.delete obj
-        if (shouldFlush(params)) {
-            try {
-                hibernateTemplate.flush()
-            }
-            catch (DataAccessException e) {
-                handleDataAccessException(hibernateTemplate, e)
-            }
+        boolean flush = shouldFlush(params)
+        try {
+            instanceApiHelper.delete instance, flush
+        }
+        catch (DataAccessException e) {
+            handleDataAccessException(hibernateTemplate, e)
         }
     }
 
diff --git a/grails-datastore-gorm-hibernate4/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/HibernateGormInstanceApi.groovy b/grails-datastore-gorm-hibernate4/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/HibernateGormInstanceApi.groovy
index fa1965ad7..5c38fbbcb 100644
--- a/grails-datastore-gorm-hibernate4/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/HibernateGormInstanceApi.groovy
+++ b/grails-datastore-gorm-hibernate4/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/HibernateGormInstanceApi.groovy
@@ -210,10 +210,9 @@ class HibernateGormInstanceApi<D> extends AbstractHibernateGormInstanceApi<D> {
 
     @Override
     void delete(D instance) {
-        def obj = instance
         boolean flush = shouldFlush()
         try {
-            instanceApiHelper.delete obj, flush
+            instanceApiHelper.delete instance, flush
         }
         catch (DataAccessException e) {
             handleDataAccessException(hibernateTemplate, e)
@@ -222,15 +221,12 @@ class HibernateGormInstanceApi<D> extends AbstractHibernateGormInstanceApi<D> {
 
     @Override
     void delete(D instance, Map params) {
-        def obj = instance
-        hibernateTemplate.delete obj
-        if (shouldFlush(params)) {
-            try {
-                hibernateTemplate.flush(instance)
-            }
-            catch (DataAccessException e) {
-                handleDataAccessException(hibernateTemplate, e)
-            }
+        boolean flush = shouldFlush(params)
+        try {
+            instanceApiHelper.delete instance, flush
+        }
+        catch (DataAccessException e) {
+            handleDataAccessException(hibernateTemplate, e)
         }
     }