more sigar.close for dmalloc

bindings/java/src/net/hyperic/sigar/cmd/Shell.java

@@ -20,7 +20,9 @@ import net.hyperic.sigar.shell.ShellCommandHandler;
 import net.hyperic.sigar.shell.ShellCommandInitException;
 import net.hyperic.sigar.shell.ShellCommandUsageException;
 
+import net.hyperic.sigar.test.SigarTestCase;
 import net.hyperic.sigar.test.SigarTestRunner;
+
 import net.hyperic.sigar.util.Getline;
 
 /**
@@ -166,6 +168,7 @@ public class Shell extends ShellBase {
 
     public void shutdown() {
         this.sigar.close();
+        SigarTestCase.closeSigar(); //shutup dmalloc
         super.shutdown();
     }
 

bindings/java/src/net/hyperic/sigar/test/SigarTestCase.java

@@ -52,6 +52,12 @@ public abstract class SigarTestCase extends TestCase {
         return sigar;
     }
 
+    public static void closeSigar() {
+        if (sigar != null) {
+            sigar.close();
+        }
+    }
+
     public Properties getProperties() {
         return this.props;
     }

bindings/java/src/net/hyperic/sigar/test/TestInvoker.java

@@ -56,6 +56,8 @@ public class TestInvoker extends SigarTestCase {
             SigarProxyCache.newInstance(sigar);
 
         testOK(proxy);
+
+        sigar.close();
     }
 
     private void testOK(SigarProxy proxy) throws Exception {

bindings/java/src/net/hyperic/sigar/test/TestLog.java

@@ -13,5 +13,6 @@ public class TestLog extends SigarTestCase {
         sigar.enableLogging(true);
         sigar.enableLogging(false);
         sigar.enableLogging(true);
+        sigar.close();
     }
 }

bindings/java/src/net/hyperic/sigar/test/TestProcTime.java

@@ -32,5 +32,7 @@ public class TestProcTime extends SigarTestCase {
         assertGtEqZeroTrace("Sys", procTime.getSys());
 
         assertGtEqZeroTrace("Total", procTime.getTotal());
+
+        sigar.close();
     }
 }

bindings/java/src/net/hyperic/sigar/test/TestThreadCpu.java

@@ -12,7 +12,7 @@ public class TestThreadCpu extends SigarTestCase {
     }
 
     public void testCreate() throws Exception {
-        Sigar sigar = new Sigar();
+        Sigar sigar = getSigar();
 
         ThreadCpu cpu;
         try {