Empty: Whitespace, serialVersionUID, final classes

[gigi.git] / src / org / cacert / gigi / dbObjects / CertificateOwner.java

diff --git a/src/org/cacert/gigi/dbObjects/CertificateOwner.java b/src/org/cacert/gigi/dbObjects/CertificateOwner.java
index d7439f2ca0b60f8323b6395f6784f8b643288c37..9719439858f558c26987a68b3bfaa8ca2f661169 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/CertificateOwner.java
+++ b/src/org/cacert/gigi/dbObjects/CertificateOwner.java
@@ -6,6 +6,8 @@ import org.cacert.gigi.database.GigiResultSet;
 
 public abstract class CertificateOwner implements IdCachable {
 
+    private static ObjectCache<CertificateOwner> myCache = new ObjectCache<>();
+
     private int id;
 
     public CertificateOwner(int id) {
@@ -18,8 +20,6 @@ public abstract class CertificateOwner implements IdCachable {
         return id;
     }
 
-    private static ObjectCache<CertificateOwner> myCache = new ObjectCache<>();
-
     public static synchronized CertificateOwner getById(int id) {
         CertificateOwner u = myCache.get(id);
         if (u == null) {
@@ -41,10 +41,10 @@ public abstract class CertificateOwner implements IdCachable {
     }
 
     protected int insert() {
-        if (id != 0) {
-            throw new Error("refusing to insert");
-        }
         synchronized (User.class) {
+            if (id != 0) {
+                throw new Error("refusing to insert");
+            }
             GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO certOwners() VALUES()");
             ps.execute();
             id = ps.lastInsertId();
@@ -122,6 +122,7 @@ public abstract class CertificateOwner implements IdCachable {
                 return true;
             }
         }
+
         return false;
     }
 
@@ -131,6 +132,7 @@ public abstract class CertificateOwner implements IdCachable {
                 return true;
             }
         }
+
         return false;
     }
 
@@ -140,4 +142,5 @@ public abstract class CertificateOwner implements IdCachable {
         ps.execute();
         myCache.remove(this);
     }
+
 }