Cleanup of CommercialFeaturesServiceFactory, adding missing DefaultCo…

…nnectionHandle changes
cryostatio · Jun 7, 2023 · 9ee6c7d · 9ee6c7d
1 parent b8cad73
commit 9ee6c7d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/org/openjdk/jmc/rjmx/internal/DefaultConnectionHandle.java b/src/main/java/org/openjdk/jmc/rjmx/internal/DefaultConnectionHandle.java
@@ -71,7 +71,7 @@ public class DefaultConnectionHandle implements IConnectionHandle {
 	public DefaultConnectionHandle(RJMXConnection connection, String description, IConnectionListener[] listeners) {
 		this.connection = connection;
 		this.description = description;
-		this.listeners = listeners;
+		this.listeners = listeners == null ? new IConnectionListener[0] : listeners;
 		registerDefaultServices();
 	}
 

diff --git a/src/main/java/org/openjdk/jmc/rjmx/services/internal/CommercialFeaturesServiceFactory.java b/src/main/java/org/openjdk/jmc/rjmx/services/internal/CommercialFeaturesServiceFactory.java
@@ -52,7 +52,7 @@ public ICommercialFeaturesService getServiceInstance(IConnectionHandle handle)
 		if (descriptor != null) {
 			JavaVersion version = new JavaVersion(descriptor.getJavaVersion());
 			if (version.getMajorVersion() >= 11) {
-				return new Jdk11CommercialFeaturesService();
+				return new NoCommercialFeaturesService();
 			}
 		}
 		return new HotSpot23CommercialFeaturesService(handle);