GRP-1095: hibernate exception handling masked original exception if roll

back fails
Internet2 · Dec 10, 2014 · 4133229 · 4133229
1 parent 0aa2a21
commit 4133229
Showing 1 changed file with 30 additions and 16 deletions.
diff --git a/grouper/src/grouper/edu/internet2/middleware/grouper/hibernate/HibernateSession.java b/grouper/src/grouper/edu/internet2/middleware/grouper/hibernate/HibernateSession.java
@@ -24,6 +24,7 @@
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.apache.commons.logging.Log;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
@@ -455,24 +456,37 @@ public static void assertNotGrouperReadonly() {
    */
   @SuppressWarnings("deprecation")
   public static void _internal_hibernateSessionCatch(HibernateSession hibernateSession, Throwable e) throws GrouperDAOException {
-
-    //if there was a save point, rollback (since postgres doesnt like a failed query not rolled back)
-    if (hibernateSession != null && hibernateSession.savepoint != null) {
-      try {
-        hibernateSession.activeHibernateSession().getSession().connection().rollback(hibernateSession.savepoint);
-      } catch (SQLException sqle) {
-        throw new RuntimeException("Problem rolling back savepoint", sqle);
+
+    try {
+      //if there was a save point, rollback (since postgres doesnt like a failed query not rolled back)
+      if (hibernateSession != null && hibernateSession.savepoint != null) {
+        try {
+          hibernateSession.activeHibernateSession().getSession().connection().rollback(hibernateSession.savepoint);
+        } catch (SQLException sqle) {
+          throw new RuntimeException("Problem rolling back savepoint", sqle);
+        }
+      }
+    } catch (RuntimeException re) {
+      //hmmm, dont die on a rollback, but put it in the original exception
+      if (!GrouperUtil.injectInException(e, "Exception rolling back savepoint in exception catch: " + ExceptionUtils.getFullStackTrace(re))) {
+        LOG.error("Error", e);
       }
     }
-
-
-    // maybe we didnt rollback. if new session, and exception, and not
-    // committed or rolledback,
-    // then rollback.
-    //CH 20080220: should we always rollback?  or if not rollback, flush and clear?
-    if (hibernateSession != null && hibernateSession.isNewHibernateSession() && !hibernateSession.isReadonly()) {
-      if (hibernateSession.immediateTransaction.isActive()) {
-        hibernateSession.immediateTransaction.rollback();
+
+    try {
+      // maybe we didnt rollback. if new session, and exception, and not
+      // committed or rolledback,
+      // then rollback.
+      //CH 20080220: should we always rollback?  or if not rollback, flush and clear?
+      if (hibernateSession != null && hibernateSession.isNewHibernateSession() && !hibernateSession.isReadonly()) {
+        if (hibernateSession.immediateTransaction.isActive()) {
+          hibernateSession.immediateTransaction.rollback();
+        }
+      }
+    } catch (RuntimeException re) {
+      //hmmm, dont die on a rollback, but put it in the original exception
+      if (!GrouperUtil.injectInException(e, "Exception rolling back in exception catch: " + ExceptionUtils.getFullStackTrace(re))) {
+        LOG.error("Error", e);
       }
     }