fix used/max file descriptor counts in oracle java 8

javamelody · Jul 27, 2015 · c04ef79 · c04ef79
1 parent 31b920e
commit c04ef79
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/javamelody-core/src/main/java/net/bull/javamelody/JavaInformations.java b/javamelody-core/src/main/java/net/bull/javamelody/JavaInformations.java
@@ -235,9 +235,7 @@ private static long buildProcessCpuTimeMillis() {
 
 	private static long buildOpenFileDescriptorCount() {
 		final OperatingSystemMXBean operatingSystem = ManagementFactory.getOperatingSystemMXBean();
-		if (isSunOsMBean(operatingSystem)
-				&& "com.sun.management.UnixOperatingSystem".equals(operatingSystem.getClass()
-						.getName())) {
+		if (isSunOsMBean(operatingSystem) && isSunUnixMBean(operatingSystem)) {
 			try {
 				return MemoryInformations.getLongFromOperatingSystem(operatingSystem,
 						"getOpenFileDescriptorCount");
@@ -251,9 +249,7 @@ private static long buildOpenFileDescriptorCount() {
 
 	private static long buildMaxFileDescriptorCount() {
 		final OperatingSystemMXBean operatingSystem = ManagementFactory.getOperatingSystemMXBean();
-		if (isSunOsMBean(operatingSystem)
-				&& "com.sun.management.UnixOperatingSystem".equals(operatingSystem.getClass()
-						.getName())) {
+		if (isSunOsMBean(operatingSystem) && isSunUnixMBean(operatingSystem)) {
 			try {
 				return MemoryInformations.getLongFromOperatingSystem(operatingSystem,
 						"getMaxFileDescriptorCount");
@@ -477,6 +473,15 @@ private static boolean isSunOsMBean(OperatingSystemMXBean operatingSystem) {
 				|| "sun.management.OperatingSystemImpl".equals(className);
 	}
 
+	private static boolean isSunUnixMBean(OperatingSystemMXBean operatingSystem) {
+		for (Class<?> inter : operatingSystem.getClass().getInterfaces()) {
+			if ("com.sun.management.UnixOperatingSystemMXBean".equals(inter.getName())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	MemoryInformations getMemoryInformations() {
 		return memoryInformations;
 	}