russell@unturf.com
9934133dcf
Add 88 new defect entries to HIGH and MEDIUM tables:
HIGH: mysql-0001/0002, mariadb-0001, redis-0001/0002, valkey-0001/0002, openvpn-0001,
vlc-0001, prometheus-0001, otel-collector-0001, cockroachdb-0001..0004,
tidb-0001..0008, kubernetes-0001/0002, go-0001, kotlin-0002, scala-0001,
allegro5-0001, sdl2-0001, grafana-0001, clickhouse-0001, duckdb-0001,
mongodb-0001, envoy-0001, istio-0001, cilium-0001, linkerd2-0001,
linux-0001/0002/0003, tor-0002/0003, curl-0001, julia-0001, lua-0001,
perl5-0001, nats-0001, spring-0003/0004, tomcat-0001, onos-0002, odl-0002
MEDIUM: helm-0001, mariadb-0002, openssl-0001/0002, memcached-0001,
cassandra-0001..0004, flink-0001, storm-0001/0002, zookeeper-0001..0003,
pip-0001, gradle-0001, nginx-0001, haproxy-0001, caddy-0001, varnish-0001,
ffmpeg-0001, gstreamer-0001, raylib-0001, love2d-0001, php-0001/0002,
r-source-0001, cpython-0002, ruby-0001, rabbitmq-0003/0004, activemq-0001,
ovs-0001, onos-0003, odl-0002, jetty-0001
PDF: 976K
58 lines
2.7 KiB
Diff
58 lines
2.7 KiB
Diff
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
|
|
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
|
|
@@ -21,6 +21,8 @@ import java.util.ArrayList;
|
|
import java.util.LinkedList;
|
|
import java.util.List;
|
|
+import java.util.Collections;
|
|
+import java.util.Set;
|
|
import java.util.concurrent.CopyOnWriteArrayList;
|
|
+import java.util.concurrent.ConcurrentHashMap;
|
|
|
|
@@ -83,6 +85,8 @@ public class Topic extends BaseDestination implements Task {
|
|
protected final CopyOnWriteArrayList<Subscription> consumers = new CopyOnWriteArrayList<Subscription>();
|
|
+ // O(1) membership guard — parallel to consumers list; updated under consumers monitor
|
|
+ private final Set<Subscription> consumerSet =
|
|
+ Collections.newSetFromMap(new ConcurrentHashMap<Subscription, Boolean>());
|
|
|
|
@@ -149,7 +153,7 @@ public class Topic extends BaseDestination implements Task {
|
|
boolean applyRecovery = false;
|
|
synchronized (consumers) {
|
|
- if (!consumers.contains(sub)){
|
|
+ if (consumerSet.add(sub)){
|
|
sub.add(context, this);
|
|
consumers.add(sub);
|
|
applyRecovery=true;
|
|
@@ -165,7 +169,7 @@ public class Topic extends BaseDestination implements Task {
|
|
} else {
|
|
synchronized (consumers) {
|
|
- if (!consumers.contains(sub)){
|
|
+ if (consumerSet.add(sub)){
|
|
sub.add(context, this);
|
|
consumers.add(sub);
|
|
super.addSubscription(context, sub);
|
|
@@ -207,12 +211,14 @@ public class Topic extends BaseDestination implements Task {
|
|
synchronized (consumers) {
|
|
- removed = consumers.remove(sub);
|
|
+ removed = consumers.remove(sub);
|
|
+ if (removed) {
|
|
+ consumerSet.remove(sub);
|
|
+ }
|
|
}
|
|
|
|
@@ -225,6 +231,7 @@ public class Topic extends BaseDestination implements Task {
|
|
synchronized (consumers) {
|
|
consumers.remove(removed);
|
|
+ consumerSet.remove(removed);
|
|
}
|
|
|
|
@@ -290,7 +297,7 @@ public class Topic extends BaseDestination implements Task {
|
|
synchronized (consumers) {
|
|
consumers.remove(subscription);
|
|
+ consumerSet.remove(subscription);
|
|
}
|
|
}
|
|
synchronized (consumers) {
|
|
- if (!consumers.contains(subscription)) {
|
|
+ if (consumerSet.add(subscription)) {
|
|
consumers.add(subscription);
|
|
}
|