Set difference to find closed connections

Author: tomas-sexenian

java/src/main/java/com/genexus/internet/CustomPoolingHttpClientConnectionManager.java

@@ -18,7 +18,7 @@
 public class CustomPoolingHttpClientConnectionManager extends PoolingHttpClientConnectionManager {
 	private final List<IConnectionObserver> observers = new ArrayList<>();
 
-	public CustomPoolingHttpClientConnectionManager(Registry<ConnectionSocketFactory> socketFactoryRegistry){
+	public CustomPoolingHttpClientConnectionManager(Registry<ConnectionSocketFactory> socketFactoryRegistry) {
 		super(socketFactoryRegistry);
 	}
 
@@ -50,39 +50,24 @@ public HttpClientConnection get(long timeout, TimeUnit tunit) throws Interrupted
 
 	@Override
 	public void closeExpiredConnections() {
-		Set<HttpRoute> beforeClosing = new HashSet<>();
-		Set<HttpRoute> afterClosing = new HashSet<>();
-
-		super.enumAvailable(entry -> {
-			if (entry.isExpired(System.currentTimeMillis())) {
-				beforeClosing.add(entry.getRoute());
-			}
-		});
+		Set<HttpRoute> beforeClosing = new HashSet<>(this.getRoutes());
 		super.closeExpiredConnections();
-		super.enumAvailable(entry -> afterClosing.add(entry.getRoute()));
-		beforeClosing.removeAll(afterClosing);
+		Set<HttpRoute> afterClosing = this.getRoutes();
 
 		for (HttpRoute route : beforeClosing)
-			notifyConnectionDestroyed(route);
+			if (!afterClosing.contains(route))
+				notifyConnectionDestroyed(route);
 	}
 
 	@Override
 	public void closeIdleConnections(long idletime, TimeUnit tunit) {
-		Set<HttpRoute> beforeClosing = new HashSet<>();
-		Set<HttpRoute> afterClosing = new HashSet<>();
-		long idleTimeoutMillis = tunit.toMillis(idletime);
-
-		super.enumAvailable(entry -> {
-			if (entry.getUpdated() + idleTimeoutMillis < System.currentTimeMillis()) {
-				beforeClosing.add(entry.getRoute());
-			}
-		});
+		Set<HttpRoute> beforeClosing = new HashSet<>(this.getRoutes());
 		super.closeIdleConnections(idletime, tunit);
-		super.enumAvailable(entry -> afterClosing.add(entry.getRoute()));
-		beforeClosing.removeAll(afterClosing);
+		Set<HttpRoute> afterClosing = this.getRoutes();
 
 		for (HttpRoute route : beforeClosing)
-			notifyConnectionDestroyed(route);
+			if (!afterClosing.contains(route))
+				notifyConnectionDestroyed(route);
 	}
 
 	private void notifyConnectionCreated(HttpRoute route) {
@@ -94,12 +79,6 @@ private void notifyConnectionDestroyed(HttpRoute route) {
 		for (IConnectionObserver observer : observers)
 			observer.onConnectionDestroyed(route);
 	}
-
-	@Override
-	protected void finalize() throws Throwable {
-		super.finalize();
-		scheduler.shutdown();
-	}
 }
 
 

java/src/main/java/com/genexus/management/HTTPConnectionJMX.java

@@ -17,7 +17,7 @@ static public void CreateHTTPConnectionJMX(HttpRoute connection) {
 		try {
 			MBeanUtils.createMBean(connection);
 		}
-		catch(Exception e) {
+		catch (Exception e) {
 			log.error("Failed to register HTTP connection MBean.", e);
 		}
 	}
@@ -26,7 +26,7 @@ static public void DestroyHTTPConnectionJMX(HttpRoute connection) {
 		try {
 			MBeanUtils.destroyMBean(connection);
 		}
-		catch(Exception e) {
+		catch (Exception e) {
 			log.error("Failed to destroy HTTP connection MBean.", e);
 		}
 	}

java/src/main/java/com/genexus/management/MBeanUtils.java

@@ -138,15 +138,15 @@ public static void createMBean(PoolingHttpClientConnectionManager connectionPool
 		if (mbs == null)
 			return;
 		HTTPPoolJMX mbean = new HTTPPoolJMX(connectionPool);
-		registerBean(mbean, "com.genexus.management:type=GeneXusApplicationServer.HTTPPool,ApplicationName=Http connection pool");
+		registerBean(mbean, "com.genexus.management:type=GeneXusApplicationServer.HTTPPool,ApplicationName=Http connection pool, Http connection pool id =" + connectionPool.hashCode());
 	}
 
 	public static void createMBean(HttpRoute httpRoute) {
 		MBeanServer mbs = getMBeanServer();
 		if (mbs == null)
 			return;
 		HTTPConnectionJMX mbean = new HTTPConnectionJMX(httpRoute);
-		registerBean(mbean, "com.genexus.management:type=GeneXusApplicationServer.HTTPPool.HTTPConnection,ApplicationName=" + httpRoute.getTargetHost().getHostName() + ",Port=" + httpRoute.getTargetHost().getPort() + ",name=Http connection");
+		registerBean(mbean, "com.genexus.management:type=GeneXusApplicationServer.HTTPPool.HTTPConnection,ApplicationName=" + httpRoute.getTargetHost().getHostName() + ",Port=" + httpRoute.getTargetHost().getPort() + ",Http connection id=" + httpRoute.hashCode());
 	}
 
   public static void createMBean(GXConnection connection)
@@ -266,7 +266,7 @@ public static void destroyMBean(HttpRoute httpRoute) {
 			return;
 
 		try {
-			ObjectName name = new ObjectName("com.genexus.management:type=GeneXusApplicationServer.HTTPPool.HTTPConnection,ApplicationName=" + httpRoute.getTargetHost().getHostName() + ",Port=" + httpRoute.getTargetHost().getPort() + ",name=Http connection");
+			ObjectName name = new ObjectName("com.genexus.management:type=GeneXusApplicationServer.HTTPPool.HTTPConnection,ApplicationName=" + httpRoute.getTargetHost().getHostName() + ",Port=" + httpRoute.getTargetHost().getPort() + ",Http connection id=" + httpRoute.hashCode());
 			registeredObjects.removeElement(name);
 
 			mbs.unregisterMBean(name);