add: nucleus assurance

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

diff --git a/src/org/cacert/gigi/database/DatabaseConnection.java b/src/org/cacert/gigi/database/DatabaseConnection.java
index 2552ed90e2ef3abe5ac65d585f76476cec694dfe..bf7cd3be38bea730e76b90cf1e5accf1c577929b 100644 (file)
--- a/src/org/cacert/gigi/database/DatabaseConnection.java
+++ b/src/org/cacert/gigi/database/DatabaseConnection.java
@@ -48,7 +48,7 @@ public class DatabaseConnection {
 
         }
 
-        public PreparedStatement getTarget() {
+        public synchronized PreparedStatement getTarget() {
             return target;
         }
 
@@ -99,7 +99,7 @@ public class DatabaseConnection {
 
     }
 
-    public static final int CURRENT_SCHEMA_VERSION = 6;
+    public static final int CURRENT_SCHEMA_VERSION = 9;
 
     public static final int CONNECTION_TIMEOUT = 24 * 60 * 60;
 
@@ -183,15 +183,11 @@ public class DatabaseConnection {
         lastAction = System.currentTimeMillis();
     }
 
-    private static DatabaseConnection instance;
+    private static volatile DatabaseConnection instance;
 
-    public static DatabaseConnection getInstance() {
+    public static synchronized DatabaseConnection getInstance() {
         if (instance == null) {
-            synchronized (DatabaseConnection.class) {
-                if (instance == null) {
-                    instance = new DatabaseConnection();
-                }
-            }
+            instance = new DatabaseConnection();
         }
         return instance;
     }
@@ -313,7 +309,7 @@ public class DatabaseConnection {
         return underUse.size();
     }
 
-    public void lockedStatements(PrintWriter writer) {
+    public synchronized void lockedStatements(PrintWriter writer) {
         writer.println(underUse.size());
         for (PreparedStatement ps : underUse) {
             for (Entry<StatementDescriptor, PreparedStatement> e : statements.entrySet()) {