Update of /var/cvs/src/org/mmbase/cache
In directory james.mmbase.org:/tmp/cvs-serv8217

Modified Files:
        CacheManager.java 
Log Message:
don't inadvertedly start mmbase


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/cache


Index: CacheManager.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/cache/CacheManager.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- CacheManager.java   18 Jul 2008 05:27:19 -0000      1.29
+++ CacheManager.java   18 Jul 2008 06:08:37 -0000      1.30
@@ -27,7 +27,7 @@
  * Cache manager manages the static methods of [EMAIL PROTECTED] Cache}. If 
you prefer you can call them on this in stead.
  *
  * @since MMBase-1.8
- * @version $Id: CacheManager.java,v 1.29 2008/07/18 05:27:19 michiel Exp $
+ * @version $Id: CacheManager.java,v 1.30 2008/07/18 06:08:37 michiel Exp $
  */
 public abstract class CacheManager {
 
@@ -116,7 +116,12 @@
         Hashtable<String, String> props = new Hashtable<String, String>();
         try {
             props.put("type", "CacheMBean");
+
+            org.mmbase.module.core.MMBase mmb = 
org.mmbase.module.Module.getModule(org.mmbase.module.core.MMBase.class, false);
+            if (mmb != null) {
             props.put("mmb", 
org.mmbase.module.core.MMBase.getMMBase().getMachineName());
+            } else {
+            }
             props.put("name", cache.getName());
             return new ObjectName("org.mmbase.cache", props);
         } catch (MalformedObjectNameException mfone) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to