Close DB in finally block

closes #157
jpos · Jun 26, 2020 · 27b0f12 · 27b0f12
1 parent dae8fc7
commit 27b0f12
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/modules/txn/src/main/java/org/jpos/transaction/Close.java b/modules/txn/src/main/java/org/jpos/transaction/Close.java
@@ -23,8 +23,6 @@
 
 import java.io.Serializable;
 
-import static org.jpos.transaction.TxnConstants.*;
-
 public class Close extends TxnSupport implements AbortParticipant {
     public int prepare (long id, Serializable o) {
         return PREPARED | READONLY;
@@ -40,16 +38,14 @@ public void abort  (long id, Serializable o) {
     }
     private void closeDB (Serializable o) {
         Context ctx = (Context) o;
-        DB db = (DB) ctx.get (DB);
+        DB db = ctx.get (DB);
         if (db != null) {
-            // ctx.checkPoint ("Closing");
-            Transaction tx = (Transaction) ctx.get (TX);
+            Transaction tx = ctx.get (TX);
             try {
                 if (tx != null) {
                     try {
                         tx.commit ();
                         ctx.remove (TX); 
-                        // ctx.checkPoint ("Close-Commit");
                     } catch (RuntimeException t) {
                         error (t);
                         try {
@@ -59,12 +55,12 @@ private void closeDB (Serializable o) {
                         }
                     }
                 }
-                db.close ();
             } catch (RuntimeException ex) {
                 error (ex);
+            } finally {
+                db.close ();
             }
         }
         checkPoint(ctx);
     }
 }
-