Fix memory leak in SSLConnectionLogger (#1321)

Signed-off-by: Ofer Levi <[email protected]>
AthenZ · Mar 4, 2021 · 91df3a6 · 91df3a6
1 parent c41ed9b
commit 91df3a6
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/..._common/src/main/java/com/yahoo/athenz/common/server/log/jetty/JettyConnectionLogger.java b/..._common/src/main/java/com/yahoo/athenz/common/server/log/jetty/JettyConnectionLogger.java
@@ -118,6 +118,10 @@ public void onClosed(Connection connection) {
                     metric.increment(METRIC_NAME, info.toMetric());
                 }
                 connectionInfo.remove(endpoint);
+                if (connection instanceof SslConnection) {
+                    SSLEngine sslEngine = ((SslConnection) connection).getSSLEngine();
+                    sslToConnectionInfo.remove(sslEngine);
+                }
             }
         });
     }
@@ -140,9 +144,13 @@ public void handshakeSucceeded(Event event) {
     public void handshakeFailed(Event event, Throwable failure) {
         SSLEngine sslEngine = event.getSSLEngine();
         handleListenerInvocation("SslHandshakeListener", "handshakeFailed", "sslEngine=%h,failure=%s", Stream.of(sslEngine, failure).collect(Collectors.toList()), () -> {
-            LOGGER.error(failure.getMessage());
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug(failure.getMessage());
+            }
             ConnectionInfo info = sslToConnectionInfo.remove(sslEngine);
-            info.setSslHandshakeFailure(failure);
+            if (info != null) {
+                info.setSslHandshakeFailure(failure);
+            }
         });
     }
     //