Skip to content

Null-proof channel state retrieval in AbstractMetricsCollector #1598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2025
Merged

Null-proof channel state retrieval in AbstractMetricsCollector #1598

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions src/main/java/com/rabbitmq/client/impl/AbstractMetricsCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,12 @@ public void basicPublish(Channel channel, long deliveryTag) {
try {
if (deliveryTag != 0) {
ChannelState channelState = channelState(channel);
if (channelState == null) {
return;
}
channelState.lock.lock();
try {
channelState(channel).unconfirmedMessageDeliveryTags.add(deliveryTag);
channelState.unconfirmedMessageDeliveryTags.add(deliveryTag);
} finally {
channelState.lock.unlock();
}
Expand Down Expand Up @@ -169,9 +172,12 @@ public void basicConsume(Channel channel, String consumerTag, boolean autoAck) {
try {
if(!autoAck) {
ChannelState channelState = channelState(channel);
if (channelState == null) {
return;
}
channelState.lock.lock();
try {
channelState(channel).consumersWithManualAck.add(consumerTag);
channelState.consumersWithManualAck.add(consumerTag);
} finally {
channelState.lock.unlock();
}
Expand All @@ -185,9 +191,12 @@ public void basicConsume(Channel channel, String consumerTag, boolean autoAck) {
public void basicCancel(Channel channel, String consumerTag) {
try {
ChannelState channelState = channelState(channel);
if (channelState == null) {
return;
}
channelState.lock.lock();
try {
channelState(channel).consumersWithManualAck.remove(consumerTag);
channelState.consumersWithManualAck.remove(consumerTag);
} finally {
channelState.lock.unlock();
}
Expand All @@ -202,9 +211,12 @@ public void consumedMessage(Channel channel, long deliveryTag, boolean autoAck)
markConsumedMessage();
if(!autoAck) {
ChannelState channelState = channelState(channel);
if (channelState == null) {
return;
}
channelState.lock.lock();
try {
channelState(channel).unackedMessageDeliveryTags.add(deliveryTag);
channelState.unackedMessageDeliveryTags.add(deliveryTag);
} finally {
channelState.lock.unlock();
}
Expand All @@ -219,6 +231,9 @@ public void consumedMessage(Channel channel, long deliveryTag, String consumerTa
try {
markConsumedMessage();
ChannelState channelState = channelState(channel);
if (channelState == null) {
return;
}
channelState.lock.lock();
try {
if(channelState.consumersWithManualAck.contains(consumerTag)) {
Expand Down
Loading