[MMBASE SCM] r40370 - in CMSContainer: branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement branches/b1_7/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement

[nico]

Author: nico
Date: 2010-01-06 23:49:03 +0100 (Wed, 06 Jan 2010)
New Revision: 40370

Modified:
   
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/BlockingCacheManager.java
   
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/BlockingCacheManager.java
   
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/BlockingCacheManager.java
Log:
Complain when cache is not there

Modified: 
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/BlockingCacheManager.java
===================================================================
--- 
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/BlockingCacheManager.java
    2010-01-06 22:29:03 UTC (rev 40369)
+++ 
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/BlockingCacheManager.java
    2010-01-06 22:49:03 UTC (rev 40370)
@@ -54,19 +54,21 @@
            return blockingCache;
        }
 
-       // Create the cache
-       synchronized (this) {
-           if (manager == null) {
-               //blockingCache = new BlockingCache(new 
CacheManager().getCache(name));
-              //Create single CacheManager instance
-              blockingCache = new 
BlockingCache(CacheManager.create().getCache(name));
-           } else {
-               blockingCache = new BlockingCache(manager.getCache(name));
-           }
+       throw new CacheException("Cache " + name + " cannot be retrieved. 
Please create the cache first");
 
-           caches.put(name, blockingCache);
-           return blockingCache;
-       }
+//     // Create the cache
+//     synchronized (this) {
+//         if (manager == null) {
+//             //blockingCache = new BlockingCache(new 
CacheManager().getCache(name));
+//            //Create single CacheManager instance
+//            blockingCache = new 
BlockingCache(CacheManager.create().getCache(name));
+//         } else {
+//             blockingCache = new BlockingCache(manager.getCache(name));
+//         }
+//
+//         caches.put(name, blockingCache);
+//         return blockingCache;
+//     }
    }
 
    /**

Modified: 
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/BlockingCacheManager.java
===================================================================
--- 
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/BlockingCacheManager.java
    2010-01-06 22:29:03 UTC (rev 40369)
+++ 
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/BlockingCacheManager.java
    2010-01-06 22:49:03 UTC (rev 40370)
@@ -54,19 +54,21 @@
            return blockingCache;
        }
 
-       // Create the cache
-       synchronized (this) {
-           if (manager == null) {
-               //blockingCache = new BlockingCache(new 
CacheManager().getCache(name));
-              //Create single CacheManager instance
-              blockingCache = new 
BlockingCache(CacheManager.create().getCache(name));
-           } else {
-               blockingCache = new BlockingCache(manager.getCache(name));
-           }
+       throw new CacheException("Cache " + name + " cannot be retrieved. 
Please create the cache first");
 
-           caches.put(name, blockingCache);
-           return blockingCache;
-       }
+//       // Create the cache
+//       synchronized (this) {
+//           if (manager == null) {
+//               //blockingCache = new BlockingCache(new 
CacheManager().getCache(name));
+//              //Create single CacheManager instance
+//              blockingCache = new 
BlockingCache(CacheManager.create().getCache(name));
+//           } else {
+//               blockingCache = new BlockingCache(manager.getCache(name));
+//           }
+//
+//           caches.put(name, blockingCache);
+//           return blockingCache;
+//       }
    }
 
    /**

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/BlockingCacheManager.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/BlockingCacheManager.java
    2010-01-06 22:29:03 UTC (rev 40369)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/BlockingCacheManager.java
    2010-01-06 22:49:03 UTC (rev 40370)
@@ -54,19 +54,21 @@
            return blockingCache;
        }
 
-       // Create the cache
-       synchronized (this) {
-           if (manager == null) {
-               //blockingCache = new BlockingCache(new 
CacheManager().getCache(name));
-              //Create single CacheManager instance
-              blockingCache = new 
BlockingCache(CacheManager.create().getCache(name));
-           } else {
-               blockingCache = new BlockingCache(manager.getCache(name));
-           }
+       throw new CacheException("Cache " + name + " cannot be retrieved. 
Please create the cache first");
 
-           caches.put(name, blockingCache);
-           return blockingCache;
-       }
+//     // Create the cache
+//     synchronized (this) {
+//         if (manager == null) {
+//             //blockingCache = new BlockingCache(new 
CacheManager().getCache(name));
+//            //Create single CacheManager instance
+//            blockingCache = new 
BlockingCache(CacheManager.create().getCache(name));
+//         } else {
+//             blockingCache = new BlockingCache(manager.getCache(name));
+//         }
+//
+//         caches.put(name, blockingCache);
+//         return blockingCache;
+//     }
    }
 
    /**

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs