From 806ee088d792c4d4f930799d3d62941da04ebf93 Mon Sep 17 00:00:00 2001
From: Doug MacEachern <dougm@hyperic.com>
Date: Wed, 29 Apr 2009 17:58:39 -0700
Subject: [PATCH] support no arg SigarRegistry constructor

---
 .../java/src/org/hyperic/sigar/cmd/Mx.java    |  7 +--
 .../org/hyperic/sigar/jmx/SigarRegistry.java  | 46 ++++++++++++++-----
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/bindings/java/src/org/hyperic/sigar/cmd/Mx.java b/bindings/java/src/org/hyperic/sigar/cmd/Mx.java
index 0fb5271a..7520b503 100644
--- a/bindings/java/src/org/hyperic/sigar/cmd/Mx.java
+++ b/bindings/java/src/org/hyperic/sigar/cmd/Mx.java
@@ -29,7 +29,6 @@ import javax.management.ObjectName;
 
 import org.hyperic.sigar.SigarException;
 import org.hyperic.sigar.jmx.SigarProcess;
-import org.hyperic.sigar.jmx.SigarRegistry;
 
 public class Mx extends SigarCommandBase {
 
@@ -68,13 +67,15 @@ public class Mx extends SigarCommandBase {
         if (isRegistered) {
             return;
         }
-        SigarRegistry registry = new SigarRegistry(this.proxy);
+
         try {
-            server.registerMBean(registry, null);
+            String name = org.hyperic.sigar.jmx.SigarRegistry.class.getName();
+            server.createMBean(name, null);
             SigarProcess proc = new SigarProcess(this.sigar);
             server.registerMBean(proc, new ObjectName(proc.getObjectName()));
             isRegistered = true;
         } catch (Exception e) {
+            e.printStackTrace();
             throw new SigarException(e.getMessage());
         }
     }
diff --git a/bindings/java/src/org/hyperic/sigar/jmx/SigarRegistry.java b/bindings/java/src/org/hyperic/sigar/jmx/SigarRegistry.java
index 156aec0c..76e6a9c3 100644
--- a/bindings/java/src/org/hyperic/sigar/jmx/SigarRegistry.java
+++ b/bindings/java/src/org/hyperic/sigar/jmx/SigarRegistry.java
@@ -28,8 +28,10 @@ import javax.management.ObjectName;
 import org.hyperic.sigar.CpuInfo;
 import org.hyperic.sigar.FileSystem;
 import org.hyperic.sigar.NetInterfaceConfig;
+import org.hyperic.sigar.Sigar;
 import org.hyperic.sigar.SigarException;
 import org.hyperic.sigar.SigarProxy;
+import org.hyperic.sigar.SigarProxyCache;
 
 /**
  * <p>Registry of all Sigar MBeans. Can be used as a convenient way to invoke 
@@ -61,18 +63,26 @@ public class SigarRegistry implements MBeanRegistration, SigarRegistryMBean {
     public static final String MBEAN_ATTR_TYPE = SigarInvokerJMX.PROP_TYPE;
 
     private static final String MBEAN_TYPE = "SigarRegistry";
+    private static final int CACHE_EXPIRE = 60 * 1000;
 
+    private Sigar sigarImpl;
     private SigarProxy sigar;
-    private final String objectName;
+    private String objectName;
 
-    private final ArrayList managedBeans;
+    private ArrayList managedBeans;
     private MBeanServer mbeanServer;
 
+    public SigarRegistry() {}
+
     public SigarRegistry(SigarProxy sigar) {
+        init(sigar);
+    }
+
+    private void init(SigarProxy sigar) {
         this.sigar = sigar;
         this.objectName =
             MBEAN_DOMAIN + ":" + MBEAN_ATTR_TYPE + "=" + MBEAN_TYPE;
-        this.managedBeans = new ArrayList();
+        this.managedBeans = new ArrayList();        
     }
 
     public String getObjectName() {
@@ -99,15 +109,24 @@ public class SigarRegistry implements MBeanRegistration, SigarRegistryMBean {
     // -------
     public ObjectName preRegister(MBeanServer server, ObjectName name)
         throws Exception {
-        this.mbeanServer = server;                                                                            
-        return new ObjectName(getObjectName());                                                               
+
+        //no args constructor support
+        if (this.sigar == null) {
+            this.sigarImpl = new Sigar();
+            init(SigarProxyCache.newInstance(this.sigarImpl, CACHE_EXPIRE));
+        }
+
+        this.mbeanServer = server;
+        if (name == null) {
+            return new ObjectName(getObjectName());                                                               
+        }
+        else {
+            return name;
+        }
     }
 
     /**
-     * Registers the default set of Sigar MBeans. Before doing so, a super call 
-     * is made to satisfy {@link AbstractMBean}.
-     * 
-     * @see AbstractMBean#postRegister(Boolean)
+     * Registers the default set of Sigar MBeans.
      */
     public void postRegister(Boolean success) {
         ReflectedMBean mbean;
@@ -205,7 +224,7 @@ public class SigarRegistry implements MBeanRegistration, SigarRegistryMBean {
 
     /**
      * Deregisters all Sigar MBeans that were created and registered using this 
-     * instance. After doing so, a super call is made to satisfy {@link AbstractMBean}.
+     * instance.
      * @throws Exception 
      * 
      * @see AbstractMBean#preDeregister()
@@ -225,6 +244,11 @@ public class SigarRegistry implements MBeanRegistration, SigarRegistryMBean {
     }
 
     public void postDeregister() {
-        this.mbeanServer = null;                                                                              
+        this.mbeanServer = null;
+        if (this.sigarImpl != null) {
+            this.sigarImpl.close();
+            this.sigarImpl = null;
+            this.sigar = null;
+        }
     }
 }