Merge "upd: Reduce Boilerplate in translated SprintfCommands"

[gigi.git] / src / org / cacert / gigi / database / GigiPreparedStatement.java

diff --git a/src/org/cacert/gigi/database/GigiPreparedStatement.java b/src/org/cacert/gigi/database/GigiPreparedStatement.java
index 411b1fd5fb840056fa5000acc58d1d8be7a164aa..eae804b800d20fb6cc29de98ff3c56a624b56a66 100644 (file)
--- a/src/org/cacert/gigi/database/GigiPreparedStatement.java
+++ b/src/org/cacert/gigi/database/GigiPreparedStatement.java
@@ -22,11 +22,7 @@ public class GigiPreparedStatement implements AutoCloseable {
 
     public GigiPreparedStatement(String stmt, boolean scroll) {
         try {
-            if (scroll) {
-                target = DatabaseConnection.getInstance().prepareInternalScrollable(stmt);
-            } else {
-                target = DatabaseConnection.getInstance().prepareInternal(stmt);
-            }
+            target = DatabaseConnection.getInstance().prepareInternal(stmt, scroll);
         } catch (SQLException e) {
             throw new Error(e);
         }
@@ -133,7 +129,11 @@ public class GigiPreparedStatement implements AutoCloseable {
         }
         PreparedStatement tg = target;
         target = null;
-        DatabaseConnection.getInstance().returnStatement(tg);
+        try {
+            DatabaseConnection.getInstance().returnStatement(tg);
+        } catch (SQLException e) {
+            throw new Error(e);
+        }
 
     }