6986: "Flight Recorder" is not working as expected for localhost Conn…

…ection Reviewed-by: hirt
openjdk · Dec 14, 2020 · 1ec1c33 · 1ec1c33
1 parent d3a3000
commit 1ec1c33
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/...rc/main/java/org/openjdk/jmc/rjmx/services/internal/CommercialFeaturesServiceFactory.java b/...rc/main/java/org/openjdk/jmc/rjmx/services/internal/CommercialFeaturesServiceFactory.java
@@ -33,6 +33,7 @@
 package org.openjdk.jmc.rjmx.services.internal;
 
 import org.openjdk.jmc.common.version.JavaVersion;
+import org.openjdk.jmc.common.version.JavaVersionSupport;
 import org.openjdk.jmc.rjmx.ConnectionException;
 import org.openjdk.jmc.rjmx.ConnectionToolkit;
 import org.openjdk.jmc.rjmx.IConnectionHandle;
@@ -55,6 +56,10 @@ public ICommercialFeaturesService getServiceInstance(IConnectionHandle handle)
 			if (version.getMajorVersion() >= 11) {
 				return new NoCommercialFeaturesService();
 			}
+		} else if (handle.isConnected() && ConnectionToolkit.isOracle(handle)) {
+			if (ConnectionToolkit.isJavaVersionAboveOrEqual(handle, JavaVersionSupport.JDK_11)) {
+				return new NoCommercialFeaturesService();
+			}
 		}
 
 		// Funnily enough, OpenJDK built JVMs for unknown reasons also have the unlock commercial features flag,