From 80ec64c3d9c522ef542a6b7d94b16faedeca752f Mon Sep 17 00:00:00 2001 From: Justin Bertram Date: Wed, 19 Jun 2024 13:55:52 -0500 Subject: [PATCH] ARTEMIS-4827 remove unreachable or redundant code --- .../extensions/xa/recovery/ActiveMQXAResourceWrapper.java | 2 -- .../apache/activemq/artemis/component/AuthenticationFilter.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java index 25cdbcc958..7e862b07af 100644 --- a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java +++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java @@ -309,8 +309,6 @@ public class ActiveMQXAResourceWrapper implements XAResource, SessionFailureList logger.debug(e.getMessage(), e); try { - if (cs != null) - cs.close(); if (serverLocator != null) serverLocator.close(); } catch (Throwable ignored) { diff --git a/artemis-web/src/main/java/org/apache/activemq/artemis/component/AuthenticationFilter.java b/artemis-web/src/main/java/org/apache/activemq/artemis/component/AuthenticationFilter.java index 73a99903c8..37aa0d1199 100644 --- a/artemis-web/src/main/java/org/apache/activemq/artemis/component/AuthenticationFilter.java +++ b/artemis-web/src/main/java/org/apache/activemq/artemis/component/AuthenticationFilter.java @@ -49,7 +49,7 @@ public class AuthenticationFilter implements Filter { //the hawtio logout servlet cleans the session and redirects to the login servlet HttpSession session = ((Request) servletRequest).getSession(false); if (session != null) { - AuditLogger.userSuccesfullyAuthenticatedInAudit(session != null ? (Subject) session.getAttribute("subject") : null); + AuditLogger.userSuccesfullyAuthenticatedInAudit((Subject) session.getAttribute("subject")); } } else if (status >= 400 && status < 599) { //Client error responses (400 – 499)