From 1ed48e9d914855f366028cdd38ab0b9c4b338d63 Mon Sep 17 00:00:00 2001 From: tomas-sexenian Date: Tue, 24 Oct 2023 11:15:54 -0300 Subject: [PATCH] Various fixes --- .../main/java/com/genexus/internet/HttpClientJavaLib.java | 5 +++-- .../main/java/com/genexus/management/HTTPConnectionJMX.java | 2 +- java/src/main/java/com/genexus/management/MBeanUtils.java | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java b/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java index 7f92ae9fe..56f029b6d 100644 --- a/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java +++ b/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java @@ -12,6 +12,7 @@ import java.security.cert.CertificateException; import java.util.*; import com.genexus.ModelContext; +import com.genexus.management.HTTPConnectionJMX; import com.genexus.management.HTTPPoolJMX; import com.genexus.management.MBeanUtils; import com.genexus.util.IniFile; @@ -91,13 +92,13 @@ private static void getPoolInstance() { @Override public void onConnectionCreated(HttpRoute route) { if (Application.isJMXEnabled()) - MBeanUtils.createMBean(route); + HTTPConnectionJMX.CreateHTTPConnectionJMX(route); } @Override public void onConnectionDestroyed(HttpRoute route) { if (Application.isJMXEnabled()) - MBeanUtils.destroyMBean(route); + HTTPConnectionJMX.DestroyHTTPConnectionJMX(route); } private ConnectionKeepAliveStrategy generateKeepAliveStrategy() { diff --git a/java/src/main/java/com/genexus/management/HTTPConnectionJMX.java b/java/src/main/java/com/genexus/management/HTTPConnectionJMX.java index b5a573778..f13586464 100644 --- a/java/src/main/java/com/genexus/management/HTTPConnectionJMX.java +++ b/java/src/main/java/com/genexus/management/HTTPConnectionJMX.java @@ -5,7 +5,7 @@ public class HTTPConnectionJMX implements HTTPConnectionJMXBean{ - private static Logger log = org.apache.logging.log4j.LogManager.getLogger(HTTPPoolJMX.class); + private static Logger log = org.apache.logging.log4j.LogManager.getLogger(HTTPConnectionJMX.class); HttpRoute connection; diff --git a/java/src/main/java/com/genexus/management/MBeanUtils.java b/java/src/main/java/com/genexus/management/MBeanUtils.java index f87aa34e0..e6579dfac 100644 --- a/java/src/main/java/com/genexus/management/MBeanUtils.java +++ b/java/src/main/java/com/genexus/management/MBeanUtils.java @@ -149,7 +149,7 @@ public static void createMBean(HttpRoute httpRoute) if (mbs == null) return; HTTPConnectionJMX mbean = new HTTPConnectionJMX(httpRoute); - registerBean(mbean, "com.genexus.management:type=GeneXusApplicationServer.ApplicationName.HTTPPool.HTTPConnection,ApplicationName=" + httpRoute.hashCode() + ",HttpConnection=" + httpRoute.toString() + ",name=Http Connection"); + registerBean(mbean, "com.genexus.management:type=GeneXusApplicationServer.ApplicationName.HTTPPool.HTTPConnection,ApplicationName=" + httpRoute.getTargetHost().getHostName() + ",Port=" + httpRoute.getTargetHost().getPort()+ ",name=http connection"); } public static void createMBean(GXConnection connection) @@ -263,7 +263,7 @@ public static void destroyMBean(GXConnection connection) } } - public static void destroyMBean(HttpRoute httpConnection) + public static void destroyMBean(HttpRoute httpRoute) { MBeanServer mbs = getMBeanServer(); if (mbs == null) @@ -271,7 +271,7 @@ public static void destroyMBean(HttpRoute httpConnection) try { - ObjectName name = new ObjectName("com.genexus.management:type=GeneXusApplicationServer.ApplicationName.HTTPPool.HTTPConnection,ApplicationName=" + httpConnection.hashCode() + ",HttpConnection=" + httpConnection.toString() + ",name=Http Connection"); + ObjectName name = new ObjectName("com.genexus.management:type=GeneXusApplicationServer.ApplicationName.HTTPPool.HTTPConnection,ApplicationName=" + httpRoute.getTargetHost().getHostName() + ",Port=" + httpRoute.getTargetHost().getPort() + ",name=http connection"); registeredObjects.removeElement(name); mbs.unregisterMBean(name);