From 4d361d4791fd09a9d4bf4929edf74d8ccef3d8b5 Mon Sep 17 00:00:00 2001
From: ian.packer <ian.packer@forgerock.com>
Date: Fri, 18 Sep 2015 07:46:49 +0000
Subject: [PATCH] Add support for IBM JVMs to getPhysicalMemorySize()

---
 opendj-server-legacy/src/main/java/org/opends/server/util/RuntimeInformation.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/RuntimeInformation.java b/opendj-server-legacy/src/main/java/org/opends/server/util/RuntimeInformation.java
index 160d05e..f80e7c7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/RuntimeInformation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/RuntimeInformation.java
@@ -198,9 +198,15 @@
       ObjectName oname = new ObjectName(
           ManagementFactory.OPERATING_SYSTEM_MXBEAN_NAME);
       // Check if this MXBean contains Sun's extension
-      if (mbs.isInstanceOf(oname, "com.sun.management.OperatingSystemMXBean")) {
-          // Get platform-specific attribute "TotalPhysicalMemorySize"
-          return (Long) mbs.getAttribute(oname, "TotalPhysicalMemorySize");
+      if (mbs.isInstanceOf(oname, "com.sun.management.OperatingSystemMXBean"))
+      {
+        // Get platform-specific attribute "TotalPhysicalMemorySize"
+        return (Long) mbs.getAttribute(oname, "TotalPhysicalMemorySize");
+      }
+      else if (mbs.isInstanceOf(oname, "com.ibm.lang.management.OperatingSystemMXBean"))
+      {
+        // IBM JVM attribute is named differently
+        return (Long) mbs.getAttribute(oname, "TotalPhysicalMemory");
       }
     }
     catch (Exception ignored)

--
Gitblit v1.10.0