Replace direct Sigar access with proxy

rhq-project · Jan 13, 2017 · 6f71078 · 6f71078
1 parent fb6d71f
commit 6f71078
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmUtility.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmUtility.java
@@ -35,10 +35,12 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hyperic.sigar.ProcCred;
-import org.hyperic.sigar.Sigar;
 import org.hyperic.sigar.SigarException;
+import org.hyperic.sigar.SigarProxy;
 
 import org.rhq.core.system.ProcessInfo;
+import org.rhq.core.system.SigarAccess;
+import org.rhq.core.system.SystemInfoException;
 import org.rhq.plugins.jmx.MBeanResourceComponent;
 
 /**
@@ -142,14 +144,14 @@ private static VirtualMachine attachToVirtualMachine(ProcessInfo process) throws
     }
 
     private static long getAgentProcessUid() {
-        Sigar sigar = new Sigar();
         try {
+            SigarProxy sigar = SigarAccess.getSigar();
             ProcCred procCred = sigar.getProcCred(sigar.getPid());
             return procCred.getEuid();
+        } catch (SystemInfoException e) {
+            return 0;
         } catch (SigarException e) {
             return 0;
-        } finally {
-            sigar.close();
         }
     }