Don’t store a Shell if there is already the real thing, always return the most real...

[Sone.git] / src / main / java / net / pterodactylus / sone / data / ShellCache.java

diff --git a/src/main/java/net/pterodactylus/sone/data/ShellCache.java b/src/main/java/net/pterodactylus/sone/data/ShellCache.java
index fd3d6bc..33e033c 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/ShellCache.java
+++ b/src/main/java/net/pterodactylus/sone/data/ShellCache.java
@@ -65,13 +65,17 @@ public class ShellCache<T> {
         *            The object to store
         */
        @SuppressWarnings("unchecked")
-       public void put(String id, T object) {
+       public T put(String id, T object) {
                if (!(object instanceof Shell<?>)) {
                        objectCache.put(id, object);
                        shellCache.remove(id);
-               } else {
-                       shellCache.put(id, (Shell<T>) object);
+                       return object;
                }
+               if (objectCache.containsKey(id)) {
+                       return objectCache.get(id);
+               }
+               shellCache.put(id, (Shell<T>) object);
+               return object;
        }
 
        /**