Spring/spring-amqp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-1181: Fix memory leak with user correlation

Browse Source 
Resolves https://github.com/spring-projects/spring-amqp/issues/1181
This commit is contained in:
Gary Russell
2020-04-09 11:02:19 -04:00
committed by Artem Bilan
parent 838b88aa87
commit ca34db16d3
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
View File

@@ -1929,25 +1929,19 @@ public class RabbitTemplate extends RabbitAccessor // NOSONAR type line count
private Message doSendAndReceiveAsListener(final String exchange, final String routingKey, final Message message,
final CorrelationData correlationData, Channel channel) throws Exception { // NOSONAR
final PendingReply pendingReply = new PendingReply();
String messageTag = String.valueOf(this.messageTagProvider.incrementAndGet());
String messageTag = null;
if (this.userCorrelationId) {
String correlationId;
if (this.correlationKey != null) {
correlationId = (String) message.getMessageProperties().getHeaders().get(this.correlationKey);
messageTag = (String) message.getMessageProperties().getHeaders().get(this.correlationKey);
}
else {
correlationId = message.getMessageProperties().getCorrelationId();
}
if (correlationId == null) {
this.replyHolder.put(messageTag, pendingReply);
}
else {
this.replyHolder.put(correlationId, pendingReply);
messageTag = message.getMessageProperties().getCorrelationId();
}
}
else {
this.replyHolder.put(messageTag, pendingReply);
if (messageTag == null) {
messageTag = String.valueOf(this.messageTagProvider.incrementAndGet());
}
this.replyHolder.put(messageTag, pendingReply);
saveAndSetProperties(message, pendingReply, messageTag);
if (logger.isDebugEnabled()) {

12
spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitTemplateIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 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.
@@ -659,6 +659,7 @@ public class RabbitTemplateIntegrationTests {
assertThat(result).isEqualTo(null);
}
@SuppressWarnings("unchecked")
@Test
public void testAtomicSendAndReceive() throws Exception {
final CachingConnectionFactory cachingConnectionFactory = new CachingConnectionFactory();
@@ -689,10 +690,12 @@ public class RabbitTemplateIntegrationTests {
// Message was consumed so nothing left on queue
reply = template.receive();
assertThat(reply).isEqualTo(null);
assertThat(TestUtils.getPropertyValue(template, "replyHolder", Map.class)).hasSize(0);
template.stop();
cachingConnectionFactory.destroy();
}
@SuppressWarnings("unchecked")
@Test
public void testAtomicSendAndReceiveUserCorrelation() throws Exception {
final CachingConnectionFactory cachingConnectionFactory = new CachingConnectionFactory();
@@ -732,6 +735,7 @@ public class RabbitTemplateIntegrationTests {
// Message was consumed so nothing left on queue
reply = template.receive();
assertThat(reply).isEqualTo(null);
assertThat(TestUtils.getPropertyValue(template, "replyHolder", Map.class)).hasSize(0);
template.stop();
container.stop();
cachingConnectionFactory.destroy();
@@ -1330,6 +1334,7 @@ public class RabbitTemplateIntegrationTests {
sendAndReceiveFastGuts(true, true, false);
}
@SuppressWarnings("unchecked")
private void sendAndReceiveFastGuts(boolean tempQueue, boolean setDirectReplyToExplicitly, boolean expectUsedTemp) {
RabbitTemplate template = createSendAndReceiveRabbitTemplate(this.connectionFactory);
try {
@@ -1368,6 +1373,7 @@ public class RabbitTemplateIntegrationTests {
else {
assertThat(replyToWas.get()).startsWith(Address.AMQ_RABBITMQ_REPLY_TO);
}
assertThat(TestUtils.getPropertyValue(template, "replyHolder", Map.class)).hasSize(0);
}
catch (Exception e) {
assertThat(e.getCause().getCause().getMessage()).contains("404");
@@ -1378,6 +1384,7 @@ public class RabbitTemplateIntegrationTests {
}
}
@SuppressWarnings("unchecked")
@Test
public void testReplyCompressionWithContainer() {
SimpleMessageListenerContainer container = new SimpleMessageListenerContainer(
@@ -1406,6 +1413,7 @@ public class RabbitTemplateIntegrationTests {
GUnzipPostProcessor unzipper = new GUnzipPostProcessor();
reply = unzipper.postProcessMessage(reply);
assertThat(new String(reply.getBody())).isEqualTo("FOO");
assertThat(TestUtils.getPropertyValue(template, "replyHolder", Map.class)).hasSize(0);
}
finally {
template.stop();
@@ -1420,7 +1428,7 @@ public class RabbitTemplateIntegrationTests {
}
@Test
public void testDegugLogOnPassiveDeclaration() {
public void testDebugLogOnPassiveDeclaration() {
CachingConnectionFactory connectionFactory = new CachingConnectionFactory("localhost");
Log logger = spy(TestUtils.getPropertyValue(connectionFactory, "logger", Log.class));
doReturn(true).when(logger).isDebugEnabled();