From 6c829d8b02536331cc921a57f52cce83f6d4e4c4 Mon Sep 17 00:00:00 2001
From: Matt Pavlovich <mattrpav@apache.org>
Date: Tue, 3 Sep 2024 10:01:40 -0500
Subject: [PATCH] [AMQ-9563] Remove usage of java.security.AccessController
 where possible. Document JDK 21 refactor TODO

---
 .../activemq/broker/jmx/AnnotatedMBean.java   |  1 +
 .../activemq/ActiveMQConnectionFactory.java   | 38 +++++--------------
 2 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java
index dfae72bf106..51c135ddf56 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java
@@ -205,6 +205,7 @@ public Object invoke(String s, Object[] objects, String[] strings) throws MBeanE
         objects = (objects == null) ? new Object[]{} : objects;
         JMXAuditLogEntry entry = null;
         if (audit != OFF) {
+            // [AMQ-9563] TODO: JDK 21 use Subject.current() instead
             Subject subject = Subject.getSubject(AccessController.getContext());
             String caller = "anonymous";
             if (subject != null) {
diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
index 8c68d5ee654..54969f39ceb 100644
--- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
+++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
@@ -19,8 +19,6 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.*;
 import java.util.concurrent.RejectedExecutionHandler;
 
@@ -67,23 +65,12 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
         String host = null;
         String port = null;
         try {
-             host = AccessController.doPrivileged(new PrivilegedAction<String>() {
-                 @Override
-                 public String run() {
-                     String result = System.getProperty("org.apache.activemq.AMQ_HOST");
-                     result = (result==null||result.isEmpty()) ?  System.getProperty("AMQ_HOST","localhost") : result;
-                     return result;
-                 }
-             });
-             port = AccessController.doPrivileged(new PrivilegedAction<String>() {
-                 @Override
-                 public String run() {
-                     String result = System.getProperty("org.apache.activemq.AMQ_PORT");
-                     result = (result==null||result.isEmpty()) ?  System.getProperty("AMQ_PORT","61616") : result;
-                     return result;
-                 }
-             });
-        }catch(Throwable e){
+            host = System.getProperty("org.apache.activemq.AMQ_HOST");
+            host = (host==null||host.isBlank()) ?  System.getProperty("AMQ_HOST","localhost") : host;
+
+            port = System.getProperty("org.apache.activemq.AMQ_PORT");
+            port = (port==null||port.isBlank()) ?  System.getProperty("AMQ_PORT","61616") : port;
+        } catch(Throwable e){
             LOG.debug("Failed to look up System properties for host and port",e);
         }
         host = (host == null || host.isEmpty()) ? "localhost" : host;
@@ -92,7 +79,6 @@ public String run() {
         DEFAULT_BROKER_PORT = Integer.parseInt(port);
     }
 
-
     public static final String DEFAULT_BROKER_BIND_URL;
 
     static{
@@ -100,15 +86,9 @@ public String run() {
         String bindURL = null;
 
         try {
-            bindURL = AccessController.doPrivileged(new PrivilegedAction<String>() {
-                @Override
-                public String run() {
-                    String result = System.getProperty("org.apache.activemq.BROKER_BIND_URL");
-                    result = (result==null||result.isEmpty()) ?  System.getProperty("BROKER_BIND_URL",defaultURL) : result;
-                    return result;
-                }
-            });
-        }catch(Throwable e){
+            bindURL = System.getProperty("org.apache.activemq.BROKER_BIND_URL");
+            bindURL = (bindURL==null||bindURL.isEmpty()) ?  System.getProperty("BROKER_BIND_URL",defaultURL) : bindURL;
+        } catch(Throwable e){
             LOG.debug("Failed to look up System properties for host and port",e);
         }
         bindURL = (bindURL == null || bindURL.isEmpty()) ? defaultURL : bindURL;