[MMBASE CVS] src/org/mmbase/cache CacheManager.java

[Michiel Meeuwissen]

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

Modified Files:
        CacheManager.java 
Log Message:
There are some dependencies on MMBaseContext, which made this unusable on 
rmmci. Fixed.


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.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- CacheManager.java   15 Nov 2008 19:15:10 -0000      1.44
+++ CacheManager.java   30 Apr 2009 18:49:07 -0000      1.45
@@ -32,7 +32,7 @@
  * static any more.
  *
  * @since MMBase-1.8
- * @version $Id: CacheManager.java,v 1.44 2008/11/15 19:15:10 michiel Exp $
+ * @version $Id: CacheManager.java,v 1.45 2009/04/30 18:49:07 michiel Exp $
  */
 public class CacheManager implements CacheManagerMBean {
 
@@ -51,6 +51,18 @@
         // singleton
     }
 
+    private static String getMachineName() {
+        String machineName;
+        try {
+            
org.mmbase.bridge.ContextProvider.getDefaultCloudContext().assertUp();
+            machineName = 
org.mmbase.module.core.MMBaseContext.getMachineName();
+        } catch (NoClassDefFoundError ncfde) {
+            //happens when RMMCI
+            machineName = "localhost";
+        }
+        return machineName;
+    }
+
     /**
      * @since MMBase-1.9.1
      */
@@ -64,10 +76,9 @@
                         final Hashtable<String, String> props = new 
Hashtable<String, String>();
 
                         try {
-                            
org.mmbase.bridge.ContextProvider.getDefaultCloudContext().assertUp();
-
                             props.put("type", "Caches");
-                            String machineName = 
org.mmbase.module.core.MMBaseContext.getMachineName();
+                            String machineName = getMachineName();
+
                             if (machineName != null) {
                                 props.put("type", machineName);
                             }
@@ -162,7 +173,6 @@
         }
         Runnable run = new Runnable() {
                 public void run() {
-                    
org.mmbase.bridge.ContextProvider.getDefaultCloudContext().assertUp();
                     ObjectName name = getObjectName(cache);
                     try {
                         MBeanServer mbs = 
ManagementFactory.getPlatformMBeanServer();
@@ -192,7 +202,7 @@
         try {
             props.put("type", "Caches");
             org.mmbase.util.transformers.CharTransformer identifier = new 
org.mmbase.util.transformers.Identifier();
-            String machineName = 
org.mmbase.module.core.MMBaseContext.getMachineName();
+            String machineName = getMachineName();
             if (machineName != null) {
                 props.put("mmb", machineName);
             } else {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs