Skip to content

AMQ-9845 Fix race condition in AMQ4889Test #1630

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
jbonofre merged 1 commit into from
Feb 1, 2026
Merged

AMQ-9845 Fix race condition in AMQ4889Test #1630

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
58 changes: 37 additions & 21 deletions activemq-unit-tests/src/test/java/org/apache/activemq/proxy/AMQ4889Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@

import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.JMSSecurityException;
import jakarta.jms.JMSException;
import jakarta.jms.Session;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;

import static org.apache.activemq.util.TestUtils.findOpenPort;
import static org.junit.Assert.assertEquals;
Expand Down Expand Up @@ -109,32 +110,47 @@ public void tearDown() throws Exception {

@Test(timeout = 60000)
public void testForConnectionLeak() throws Exception {
Integer expectedConnectionCount = 0;
for (int i=0; i < ITERATIONS; i++) {
try {
if (i % 2 == 0) {
LOG.debug("Iteration {} adding bad connection", i);
Connection connection = connectionFactory.createConnection(USER, WRONG_PASSWORD);
int successfulConnections = 0;
int failedConnections = 0;

for (int i = 0; i < ITERATIONS; i++) {
if (i % 2 == 0) {
// Expected to fail - bad password
// Use try-with-resources to ensure failed connections are cleaned up
LOG.debug("Iteration {} adding bad connection", i);
try (final Connection connection = connectionFactory.createConnection(USER, WRONG_PASSWORD)) {
connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
fail("createSession should fail");
} else {
LOG.debug("Iteration {} adding good connection", i);
Connection connection = connectionFactory.createConnection(USER, GOOD_USER_PASSWORD);
fail("createSession should fail with bad password");
} catch (final JMSException e) {
// Authentication failure can be JMSSecurityException (synchronous)
// or JMSException "Disposed due to prior exception" (asynchronous)
// we don't care much here as long as it fails, but we could add an ExceptionListener to the connection
// to check more closely if desired.
failedConnections++;
}
} else {
// Expected to succeed - good password
// Do NOT close - test verifies these connections persist
LOG.debug("Iteration {} adding good connection", i);
try { // do not use try-with-resources here, because we want to keep the connection open and assert at the end
final Connection connection = connectionFactory.createConnection(USER, GOOD_USER_PASSWORD);
connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
expectedConnectionCount++;
successfulConnections++;
} catch (final JMSException e) {
fail("Good connection should not fail: " + e.getMessage());
}
} catch (JMSSecurityException e) {
}
LOG.debug("Iteration {} Connections? {}", i, proxyConnector.getConnectionCount());
}
final Integer val = expectedConnectionCount;
Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
return val.equals(proxyConnector.getConnectionCount());
}
}, 20);
assertEquals(val, proxyConnector.getConnectionCount());

// Verify we had the expected number of failures and successes
assertEquals("Failed connections", ITERATIONS / 2, failedConnections);
assertEquals("Successful connections", ITERATIONS / 2, successfulConnections);

// Wait for proxy connector to reflect only the successful (still open) connections
final int expectedConnections = successfulConnections;
Wait.waitFor(() -> expectedConnections == proxyConnector.getConnectionCount(), TimeUnit.SECONDS.toMillis(20));
assertEquals("Proxy connection count", expectedConnections, (int) proxyConnector.getConnectionCount());
}

}
Loading