From a871564ea2d4a8d5465f05c4212e7a7138f3723c Mon Sep 17 00:00:00 2001
From: Weimin Yu <weiminyu@google.com>
Date: Mon, 6 Jul 2020 17:39:13 -0400
Subject: [PATCH] Make sure uncommitted txn is rolled back (#665)

* Make sure uncommit txn is rolled back

The try block around commit that catches RuntimeException should also
catch Error, which is also unchecked.
---
 .../persistence/transaction/JpaTransactionManagerImpl.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java b/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java
index b1f2cf062..d3aa5f19c 100644
--- a/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java
+++ b/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java
@@ -101,7 +101,8 @@ public class JpaTransactionManagerImpl implements JpaTransactionManager {
       T result = work.get();
       txn.commit();
       return result;
-    } catch (RuntimeException e) {
+    } catch (RuntimeException | Error e) {
+      // Error is unchecked!
       try {
         txn.rollback();
         logger.atWarning().log("Error during transaction; transaction rolled back");