Skip to content

camel-salesforce: Fix race condition in channel subscription and improve reconnect advice handling #22874

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

Open
shaipan wants to merge 5 commits into
base: main
Choose a base branch
from
+42 −11
Open

camel-salesforce: Fix race condition in channel subscription and improve reconnect advice handling #22874

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4b24b1b
camel-salesforce: Fix race condition in channel subscription and impr…
shaipan Apr 30, 2026
038f4a6
Replace synchronized blocks with ReentrantLock for VirtualThread support
shaipan Apr 30, 2026
78105ad
Address review: restore handshake on null advice per Bayeux spec
shaipan May 1, 2026
cc9c82a
Fix duplicate event delivery: remove channelsToSubscribe.add() from s…
shaipan May 1, 2026
ed6412b
Fix NPE: use constant.equals(failureReason) for null-safe comparison …
shaipan May 1, 2026
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
53 changes: 42 additions & 11 deletions ...ain/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.net.URI;
import java.time.Duration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand All @@ -31,6 +32,8 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Stream;

import org.apache.camel.CamelException;
Expand Down Expand Up @@ -108,6 +111,7 @@ public class SubscriptionHelper extends ServiceSupport {
= new ConcurrentHashMap<>();

private final Set<String> channelsToSubscribe = ConcurrentHashMap.newKeySet();
private final Lock channelsLock = new ReentrantLock();

private final ClientSessionChannel.MessageListener handshakeListener = createHandshakeListener();

Expand All @@ -133,7 +137,7 @@ private MessageListener createHandshakeListener() {
if (handshakeError != null) {
if (handshakeError.startsWith("403::")) {
String failureReason = getFailureReason(message);
if (failureReason.equals(AUTHENTICATION_INVALID)) {
if (AUTHENTICATION_INVALID.equals(failureReason)) {
LOG.debug(
"attempting login due to handshake error: 403 -> 401::Authentication invalid");
session.attemptLoginUntilSuccessful(backoffIncrement, maxBackoff);
Expand All @@ -144,8 +148,13 @@ private MessageListener createHandshakeListener() {
LOG.debug("Handshake failed, so try again.");
client.handshake();
} else if (!channelToConsumers.isEmpty()) {
channelsToSubscribe.clear();
channelsToSubscribe.addAll(channelToConsumers.keySet());
channelsLock.lock();
try {
channelsToSubscribe.clear();
channelsToSubscribe.addAll(channelToConsumers.keySet());
} finally {
channelsLock.unlock();
}
LOG.info("Handshake successful. Channels to subscribe: {}", channelsToSubscribe);
}
});
Expand All @@ -154,6 +163,9 @@ private MessageListener createHandshakeListener() {
private MessageListener createConnectionListener() {
return (channel, message) -> component.getHttpClient().getWorkerPool().execute(() -> {
LOG.debug("[CHANNEL:META_CONNECT]: {}", message);
String reconnectAdvice = message.getAdvice() != null
? (String) message.getAdvice().get("reconnect")
: null;

if (!message.isSuccessful()) {
LOG.warn("Connect failure: {}", message);
Expand All @@ -165,15 +177,35 @@ private MessageListener createConnectionListener() {
LOG.debug("Attempting login...");
session.attemptLoginUntilSuccessful(backoffIncrement, maxBackoff);
}
if (message.getAdvice() == null || "none".equals(message.getAdvice().get("reconnect"))) {
LOG.debug("Advice == none, so handshaking");
// Per Bayeux spec: handshake on null advice, "none", "handshake", or any non-"retry" value.
// When advice is "retry", the CometD client handles reconnection automatically.
if (reconnectAdvice == null || !"retry".equals(reconnectAdvice)) {
LOG.debug("Reconnect advice [{}] on failed connect, initiating handshake", reconnectAdvice);
client.handshake();
} else if (isTemporaryError(message)) {
LOG.debug("Initiating handshake after temporary error: {}", message);
client.handshake();
}
} else if (!channelsToSubscribe.isEmpty()) {
LOG.info("Subscribing to channels: {}", channelsToSubscribe);
for (var channelName : channelsToSubscribe) {
for (var consumer : channelToConsumers.get(channelName)) {
subscribe(consumer);
} else if (reconnectAdvice != null && !"retry".equals(reconnectAdvice)) {
LOG.warn("Reconnect advice [{}] on successful connect, initiating handshake", reconnectAdvice);
client.handshake();
} else {
Set<String> toSubscribe = null;
channelsLock.lock();
try {
if (!channelsToSubscribe.isEmpty()) {
toSubscribe = new HashSet<>(channelsToSubscribe);
channelsToSubscribe.clear();
}
} finally {
channelsLock.unlock();
}
if (toSubscribe != null) {
LOG.info("Subscribing to channels: {}", toSubscribe);
for (var channelName : toSubscribe) {
for (var consumer : channelToConsumers.get(channelName)) {
subscribe(consumer);
}
}
}
}
Expand Down Expand Up @@ -448,7 +480,6 @@ public void subscribe(StreamingApiConsumer consumer) {
// create subscription for consumer
final String channelName = getChannelName(consumer.getTopicName());
channelToConsumers.computeIfAbsent(channelName, key -> ConcurrentHashMap.newKeySet()).add(consumer);
channelsToSubscribe.add(channelName);

setReplayIdIfAbsent(consumer.getEndpoint());

Expand Down
Loading