From 7da4760af26519051b1accd840c9199a11f7491a Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Mon, 10 Dec 2018 16:53:15 +0000
Subject: [PATCH] JCS...

---
 borgbutler-core/src/main/java/de/micromata/borgbutler/cache/JCSCache.java |   27 ++++++---------------------
 1 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/JCSCache.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/JCSCache.java
index 5f4fa4d..9dbadb6 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/JCSCache.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/JCSCache.java
@@ -18,28 +18,12 @@
     private static final String CONFIG_FILE = "jcs-basic-config.properties";
     public static final String CACHE_DIR_NAME = "cache";
 
-    public enum Region {DEFAULT, ARCHIVE_CONTENT}
-
     public static JCSCache getInstance() {
         return instance;
     }
 
-    /**
-     * @param <K>
-     * @param <V>
-     * @return JCS cache for default region.
-     */
-    public <K, V> CacheAccess<K, V> getJCSCache() {
-        return JCS.getInstance("default");
-    }
-
-    public <K, V> CacheAccess<K, V> getJCSCache(Region region) {
-        switch (region) {
-            case ARCHIVE_CONTENT:
-                return JCS.getInstance("default");
-            default:
-                return getJCSCache();
-        }
+    public <K, V> CacheAccess<K, V> getJCSCache(String region) {
+        return JCS.getInstance(region);
     }
 
     private JCSCache() {
@@ -57,9 +41,10 @@
             log.error("Error while loading jcs config file '" + CONFIG_FILE + "': " + ex.getMessage(), ex);
         }
         props.setProperty("jcs.auxiliary.DC.attributes.DiskPath", cacheDir.getAbsolutePath());
-        props.setProperty("jcs.auxiliary.DC2.attributes.DiskPath", cacheDir.getAbsolutePath());
-        int cacheMaxDiscSizeMB = configuration.getCacheMaxDiscSizeMB();
-        props.setProperty("jcs.auxiliary.DC2.attributes.MaxKeySize", String.valueOf(cacheMaxDiscSizeMB * 1000));
+        //props.setProperty("jcs.auxiliary.DC2.attributes.DiskPath", cacheDir.getAbsolutePath());
+        //int cacheMaxDiscSizeMB = configuration.getCacheMaxDiscSizeMB();
+        //log.info("Using cache size for archive contents: " + cacheMaxDiscSizeMB + "MB.");
+        //props.setProperty("jcs.auxiliary.DC2.attributes.MaxKeySize", String.valueOf(cacheMaxDiscSizeMB * 1000));
         JCS.setConfigProperties(props);
     }
 }

--
Gitblit v1.10.0