From 809949021333d29edc4513e6f08c28a56d2414e8 Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Thu, 18 Apr 2013 12:47:09 -0400
Subject: [PATCH] Minor DB tweaks.

---
 .../nossr50/database/DatabaseManager.java     | 84 +++++++++----------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/database/DatabaseManager.java b/src/main/java/com/gmail/nossr50/database/DatabaseManager.java
index e9356296b..32f426985 100644
--- a/src/main/java/com/gmail/nossr50/database/DatabaseManager.java
+++ b/src/main/java/com/gmail/nossr50/database/DatabaseManager.java
@@ -196,30 +196,32 @@ public final class DatabaseManager {
      * @return the number of rows affected
      */
     public static int update(String sql) {
-        int ret = 0;
+        if (!checkConnected()) {
+            return 0;
+        }
 
-        if (checkConnected()) {
-            PreparedStatement statement = null;
-            try {
-                statement = connection.prepareStatement(sql);
-                ret = statement.executeUpdate();
-            }
-            catch (SQLException ex) {
-                printErrors(ex);
-            }
-            finally {
-                if (statement != null) {
-                    try {
-                        statement.close();
-                    }
-                    catch (SQLException e) {
-                        printErrors(e);
-                    }
+        int rows = 0;
+
+        PreparedStatement statement = null;
+        try {
+            statement = connection.prepareStatement(sql);
+            rows = statement.executeUpdate();
+        }
+        catch (SQLException ex) {
+            printErrors(ex);
+        }
+        finally {
+            if (statement != null) {
+                try {
+                    statement.close();
+                }
+                catch (SQLException e) {
+                    printErrors(e);
                 }
             }
         }
 
-        return ret;
+        return rows;
     }
 
     /**
@@ -229,34 +231,32 @@ public final class DatabaseManager {
      * @return the value in the first row / first field
      */
     public static int getInt(String sql) {
-        ResultSet resultSet = null;
+        if (!checkConnected()) {
+            return 0;
+        }
+
         int result = 0;
 
-        if (checkConnected()) {
-            PreparedStatement statement = null;
+        PreparedStatement statement = null;
 
-            try {
-                statement = connection.prepareStatement(sql);
-                resultSet = statement.executeQuery();
+        try {
+            statement = connection.prepareStatement(sql);
+            ResultSet resultSet = statement.executeQuery();
 
-                if (resultSet.next()) {
-                    result = resultSet.getInt(1);
-                }
-                else {
-                    result = 0;
-                }
+            if (resultSet.next()) {
+                result = resultSet.getInt(1);
             }
-            catch (SQLException ex) {
-                printErrors(ex);
-            }
-            finally {
-                if (statement != null) {
-                    try {
-                        statement.close();
-                    }
-                    catch (SQLException e) {
-                        printErrors(e);
-                    }
+        }
+        catch (SQLException ex) {
+            printErrors(ex);
+        }
+        finally {
+            if (statement != null) {
+                try {
+                    statement.close();
+                }
+                catch (SQLException e) {
+                    printErrors(e);
                 }
             }
         }