bring back closeSigar() call in shutdown (commented out in cd42290)

pquerna · Apr 21, 2010 · b3078dc · b3078dc
1 parent a5dacd4
commit b3078dc
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/bindings/java/src/org/hyperic/sigar/cmd/Shell.java b/bindings/java/src/org/hyperic/sigar/cmd/Shell.java
@@ -199,9 +199,18 @@ public String getUserDeniedMessage(long pid) {
 
     public void shutdown() {
         this.sigar.close();
-        //avoid possible Class Not Found: junit/framework/TestCase
-        if (System.getProperty("jni.dmalloc") != null) {
-            //org.hyperic.sigar.test.SigarTestCase.closeSigar(); //shutup dmalloc
+        //cleanup for dmalloc
+        //using reflection incase junit.jar is not present
+        try {
+            //SigarTestCase.closeSigar();
+            Class.forName("org.hyperic.sigar.test.SigarTestCase").
+                getMethod("closeSigar", new Class[0]).invoke(null, new Object[0]);
+        } catch (ClassNotFoundException e) {
+            //SigarTestCase.java not compiled w/o junit.jar
+        } catch (Exception e) {
+            e.printStackTrace();
+        } catch (NoClassDefFoundError e) {
+            //avoiding possible Class Not Found: junit/framework/TestCase
         }
         super.shutdown();
     }