Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1128 from hyteio/AMQ-9216 

[AMQ-9216] Remove deprecated java.lang.SecurityManager usage from activemq-client IdGenerator
This commit is contained in:
JB Onofré 2024-02-28 16:54:32 +01:00 committed by GitHub
parent 1e37fe64e8 e24c756e8d
commit 99dced2fa7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 66 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/IdGenerator.java
View File

@ -41,17 +41,7 @@ public class IdGenerator {
static { static {
String stub = ""; String stub = "";
boolean canAccessSystemProps = true;
try {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPropertiesAccess();
}
} catch (SecurityException se) {
canAccessSystemProps = false;
}
if (canAccessSystemProps) {
int idGeneratorPort = 0; int idGeneratorPort = 0;
ServerSocket ss = null; ServerSocket ss = null;
try { try {
@ -85,7 +75,6 @@ public class IdGenerator {
} }
} }
} }
}
if (hostName == null) { if (hostName == null) {
hostName = "localhost"; hostName = "localhost";

13
activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java
View File

@ -41,17 +41,6 @@ public class IdGenerator {
static { static {
String stub = ""; String stub = "";
boolean canAccessSystemProps = true;
try {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPropertiesAccess();
}
} catch (SecurityException se) {
canAccessSystemProps = false;
}
if (canAccessSystemProps) {
hostName = System.getProperty(PROPERTY_IDGENERATOR_HOSTNAME); hostName = System.getProperty(PROPERTY_IDGENERATOR_HOSTNAME);
int localPort = Integer.parseInt(System.getProperty(PROPERTY_IDGENERATOR_LOCALPORT, "0")); int localPort = Integer.parseInt(System.getProperty(PROPERTY_IDGENERATOR_LOCALPORT, "0"));
@ -97,7 +86,7 @@ public class IdGenerator {
} }
} }
} }
}
// fallback // fallback
if (hostName == null) { if (hostName == null) {
hostName = "localhost"; hostName = "localhost";