X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FObjectCache.java;h=125477defc5fd26e33bff9d51153d9617c06a15b;hb=a61a2d320cc2bb730528832133a8220cb5b80d68;hp=d1e41f82e3baaa0b359e6d55b1283fb81e0b85c4;hpb=ec24cf6925bb3729a644580ad4a9375d05883c62;p=gigi.git

diff --git a/src/org/cacert/gigi/dbObjects/ObjectCache.java b/src/org/cacert/gigi/dbObjects/ObjectCache.java
index d1e41f82..125477de 100644
--- a/src/org/cacert/gigi/dbObjects/ObjectCache.java
+++ b/src/org/cacert/gigi/dbObjects/ObjectCache.java
@@ -6,16 +6,17 @@ import java.util.HashSet;
 
 public class ObjectCache<T extends IdCachable> {
 
-    private HashMap<Integer, WeakReference<T>> hashmap = new HashMap<>();
+    private final HashMap<Integer, WeakReference<T>> hashmap = new HashMap<>();
 
-    private static HashSet<ObjectCache<?>> caches = new HashSet<>();
+    private static final HashSet<ObjectCache<? extends IdCachable>> caches = new HashSet<>();
 
     protected ObjectCache() {
         caches.add(this);
     }
 
-    public void put(T c) {
+    public T put(T c) {
         hashmap.put(c.getId(), new WeakReference<T>(c));
+        return c;
     }
 
     public T get(int id) {
@@ -27,12 +28,12 @@ public class ObjectCache<T extends IdCachable> {
     }
 
     public static void clearAllCaches() {
-        for (ObjectCache<?> objectCache : caches) {
+        for (ObjectCache<? extends IdCachable> objectCache : caches) {
             objectCache.hashmap.clear();
         }
     }
 
     public void remove(T toRm) {
-        hashmap.remove(toRm);
+        hashmap.remove(toRm.getId());
     }
 }