Fixes [IMMUTANT-304]

immutant · Jul 9, 2013 · 2adfd1f · 2adfd1f
1 parent 6905335
commit 2adfd1f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/modules/cache/src/main/clojure/immutant/cache/core.clj b/modules/cache/src/main/clojure/immutant/cache/core.clj
@@ -90,10 +90,13 @@
       locking (throw (IllegalArgumentException. (str "Invalid locking mode: " locking))))
     (.build builder)))
 
-(defn default-mode []
+(defn default-mode [opts]
   (if (and service (.isClustered service))
-    :distributed
-    :local))
+    (merge {:mode :distributed} opts)
+    (do
+      (if-not (= :local (:mode opts :local))
+        (log/warn "Cache replication only supported when clustered"))
+      (assoc opts :mode :local))))
 
 (defn get-cache
   "Returns the named cache if it exists, otherwise nil"
@@ -105,7 +108,7 @@
   "Defaults to :distributed with :sync=true for a clustered cache, otherwise :local"
   [name opts]
   (let [default (.getDefaultCacheConfiguration @manager)
-        settings (merge {:template default, :mode (default-mode), :sync true} opts)
+        settings (merge {:template default, :sync true} (default-mode opts))
         config (build-config settings)]
     (log/info (str "Configuring cache [" name "] as "
                    (select-keys settings [:mode :sync :locking :persist :max-entries :eviction])))

diff --git a/modules/cache/src/test/clojure/test/immutant/cache.clj b/modules/cache/src/test/clojure/test/immutant/cache.clj
@@ -226,3 +226,6 @@
   (let [seed {:a 1, :b {:c 42}}
         c (create "seedy" :seed seed)]
     (is (= seed (into {} (seq c))))))
+
+(deftest default-to-local "should not raise exception"
+  (create "remote" :mode :replicated))