You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2024/06/20 00:22:52 UTC
(activemq-artemis) branch main updated: ARTEMIS-4827 remove unreachable or redundant code
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 80ec64c3d9 ARTEMIS-4827 remove unreachable or redundant code
80ec64c3d9 is described below
commit 80ec64c3d9c522ef542a6b7d94b16faedeca752f
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Wed Jun 19 13:55:52 2024 -0500
ARTEMIS-4827 remove unreachable or redundant code
---
.../service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java | 2 --
.../org/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)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@activemq.apache.org
For additional commands, e-mail: commits-help@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact