GRAILS-9922 - After a test of validation error, another test of delet…

…e() was failed
lhotari · Sep 3, 2013 · 480f71a · 480f71a
1 parent 8029fc6
commit 480f71a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 22 deletions.
diff --git a/.../src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/HibernateGormInstanceApi.groovy b/.../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/.../src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/HibernateGormInstanceApi.groovy b/.../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)
         }
     }