Skip to content
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

Jump to bottom

GH-1524: Fix ThreadChannelCF with Transactional #1525

Merged
merged 1 commit into from
Oct 26, 2022
Merged

GH-1524: Fix ThreadChannelCF with Transactional #1525

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions .../main/java/org/springframework/amqp/rabbit/connection/ThreadChannelConnectionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,7 @@ private Channel createProxy(Channel channel, boolean transactional) {
}

private void handleClose(Channel channel, boolean transactional) {

if (transactional && this.txChannels.get() == null ? true : this.channels.get() == null) {
if ((transactional && this.txChannels.get() == null) || (!transactional && this.channels.get() == null)) {
physicalClose(channel);
}
else {
Expand Down
32 changes: 31 additions & 1 deletion .../java/org/springframework/amqp/rabbit/connection/ThreadChannelConnectionFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2021 the original author or authors.
* Copyright 2020-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -110,6 +110,36 @@ void testBasic() throws Exception {
.isFalse();
}

@Test
void testClose() throws Exception {
ConnectionFactory rabbitConnectionFactory = new ConnectionFactory();
rabbitConnectionFactory.setHost("localhost");
ThreadChannelConnectionFactory tccf = new ThreadChannelConnectionFactory(rabbitConnectionFactory);
Connection conn = tccf.createConnection();
Channel chann1 = conn.createChannel(false);
Channel targetChannel1 = ((ChannelProxy) chann1).getTargetChannel();
chann1.close();
Channel chann2 = conn.createChannel(false);
Channel targetChannel2 = ((ChannelProxy) chann2).getTargetChannel();
assertThat(chann2).isSameAs(chann1);
assertThat(targetChannel2).isSameAs(targetChannel1);
}

@Test
void testTxClose() throws Exception {
ConnectionFactory rabbitConnectionFactory = new ConnectionFactory();
rabbitConnectionFactory.setHost("localhost");
ThreadChannelConnectionFactory tccf = new ThreadChannelConnectionFactory(rabbitConnectionFactory);
Connection conn = tccf.createConnection();
Channel chann1 = conn.createChannel(true);
Channel targetChannel1 = ((ChannelProxy) chann1).getTargetChannel();
chann1.close();
Channel chann2 = conn.createChannel(true);
Channel targetChannel2 = ((ChannelProxy) chann2).getTargetChannel();
assertThat(chann2).isSameAs(chann1);
assertThat(targetChannel2).isSameAs(targetChannel1);
}

@Test
void queueDeclared(@Autowired RabbitAdmin admin, @Autowired Config config,
@Autowired ThreadChannelConnectionFactory tccf) throws Exception {
Expand Down