This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a commit to branch activemq-5.19.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.19.x by this push:
new 4e541f667c Replace active temp dests map with set (#2113) (#2115)
4e541f667c is described below
commit 4e541f667cd0489527a19564573d9740eacb7516
Author: Christopher L. Shannon <[email protected]>
AuthorDate: Mon Jun 15 12:28:54 2026 -0400
Replace active temp dests map with set (#2113) (#2115)
For some reason ActiveMQConnection was using a map instead of a set to
store the destinations, and just stored the exact same thing as the key
and value. Furthermore, when checking if the map contained the
destination a call was being made to containsValue() which requires
iterating over the entire map.
This commit replaced the Map with a Set which simplifies things and
makes the contains() check constant. Also, the scope of the set was
changed from public to package because it makes no sense to have the
scope as public and should be limited to only classes in the same
package.
(cherry picked from commit b20a4c72d9042bb988f3cdf1479874cd573eb12d)
---
.../java/org/apache/activemq/ActiveMQConnection.java | 17 +++++++----------
.../main/java/org/apache/activemq/AdvisoryConsumer.java | 2 +-
.../org/apache/activemq/JmsTempDestinationTest.java | 16 ++++------------
3 files changed, 12 insertions(+), 23 deletions(-)
diff --git
a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
index 2ccac1d99c..8dde1b9c98 100644
--- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
+++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -118,7 +119,7 @@ public class ActiveMQConnection implements Connection,
TopicConnection, QueueCon
private static final Logger LOG =
LoggerFactory.getLogger(ActiveMQConnection.class);
- public final ConcurrentMap<ActiveMQTempDestination,
ActiveMQTempDestination> activeTempDestinations = new ConcurrentHashMap<>();
+ final Set<ActiveMQTempDestination> activeTempDestinations =
ConcurrentHashMap.newKeySet();
protected boolean dispatchAsync=true;
protected boolean alwaysSessionAsync = true;
@@ -2128,7 +2129,7 @@ public class ActiveMQConnection implements Connection,
TopicConnection, QueueCon
syncSendPacket(info);
dest.setConnection(this);
- activeTempDestinations.put(dest, dest);
+ activeTempDestinations.add(dest);
return dest;
}
@@ -2164,7 +2165,7 @@ public class ActiveMQConnection implements Connection,
TopicConnection, QueueCon
return false;
}
- return !activeTempDestinations.containsValue(dest);
+ return !activeTempDestinations.contains(dest);
}
public boolean isCopyMessageOnSend() {
@@ -2527,21 +2528,17 @@ public class ActiveMQConnection implements Connection,
TopicConnection, QueueCon
*/
public void cleanUpTempDestinations() {
- if (this.activeTempDestinations == null ||
this.activeTempDestinations.isEmpty()) {
+ if (this.activeTempDestinations.isEmpty()) {
return;
}
- Iterator<ConcurrentMap.Entry<ActiveMQTempDestination,
ActiveMQTempDestination>> entries
- = this.activeTempDestinations.entrySet().iterator();
- while(entries.hasNext()) {
- ConcurrentMap.Entry<ActiveMQTempDestination,
ActiveMQTempDestination> entry = entries.next();
+ for (ActiveMQTempDestination dest : activeTempDestinations) {
try {
// Only delete this temp destination if it was created from
this connection. The connection used
// for the advisory consumer may also have a reference to this
temp destination.
- ActiveMQTempDestination dest = entry.getValue();
String thisConnectionId = (info.getConnectionId() == null) ?
"" : info.getConnectionId().toString();
if (dest.getConnectionId() != null &&
dest.getConnectionId().equals(thisConnectionId)) {
- this.deleteTempDestination(entry.getValue());
+ this.deleteTempDestination(dest);
}
} catch (Exception ex) {
// the temp dest is in use so it can not be deleted.
diff --git
a/activemq-client/src/main/java/org/apache/activemq/AdvisoryConsumer.java
b/activemq-client/src/main/java/org/apache/activemq/AdvisoryConsumer.java
index 1e65ffb06b..2c582c9134 100644
--- a/activemq-client/src/main/java/org/apache/activemq/AdvisoryConsumer.java
+++ b/activemq-client/src/main/java/org/apache/activemq/AdvisoryConsumer.java
@@ -100,7 +100,7 @@ public class AdvisoryConsumer implements ActiveMQDispatcher
{
if (tempDest.getConnection() != null) {
tempDest = (ActiveMQTempDestination)
tempDest.createDestination(tempDest.getPhysicalName());
}
- connection.activeTempDestinations.put(tempDest, tempDest);
+ connection.activeTempDestinations.add(tempDest);
} else if (dinfo.getOperationType() ==
DestinationInfo.REMOVE_OPERATION_TYPE) {
connection.activeTempDestinations.remove(tempDest);
}
diff --git
a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTempDestinationTest.java
b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTempDestinationTest.java
index bd87b3daa8..0ad37675a6 100644
---
a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTempDestinationTest.java
+++
b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTempDestinationTest.java
@@ -220,12 +220,8 @@ public class JmsTempDestinationTest extends TestCase {
connection.start();
final ActiveMQConnection activeMQConnection = (ActiveMQConnection)
connection;
- assertTrue("creation advisory received in time with async dispatch",
Wait.waitFor(new Wait.Condition() {
- @Override
- public boolean isSatisified() throws Exception {
- return
activeMQConnection.activeTempDestinations.containsKey(queue);
- }
- }));
+ assertTrue("creation advisory received in time with async dispatch",
+ Wait.waitFor(() ->
activeMQConnection.activeTempDestinations.contains(queue)));
// This message delivery should work since the temp connection is still
// open.
@@ -267,12 +263,8 @@ public class JmsTempDestinationTest extends TestCase {
connection.start();
final ActiveMQConnection activeMQConnection = (ActiveMQConnection)
connection;
- assertTrue("creation advisory received in time with async dispatch",
Wait.waitFor(new Wait.Condition() {
- @Override
- public boolean isSatisified() throws Exception {
- return
activeMQConnection.activeTempDestinations.containsKey(queue);
- }
- }));
+ assertTrue("creation advisory received in time with async dispatch",
+ Wait.waitFor((Wait.Condition) () ->
activeMQConnection.activeTempDestinations.contains(queue)));
// This message delivery should work since the temp connection is still
// open.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
