From 42dfa4015167a660af102c0ca5064f4268901a1a Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 15 Jan 2018 15:42:50 +0100
Subject: [PATCH] Make sure endpoint settings override default factory settings

Issue: SPR-16338
---
 .../AbstractJmsListenerContainerFactory.java    |  4 ++--
 .../JmsListenerContainerFactoryTests.java       | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java b/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
index 67987f0788..90c5eb53b4 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -228,8 +228,8 @@ public abstract class AbstractJmsListenerContainerFactory<C extends AbstractMess
 			instance.setAutoStartup(this.autoStartup);
 		}
 
-		endpoint.setupListenerContainer(instance);
 		initializeContainer(instance);
+		endpoint.setupListenerContainer(instance);
 
 		return instance;
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java
index 6363a92319..3a0162910b 100644
--- a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -150,6 +150,21 @@ public class JmsListenerContainerFactoryTests {
 		assertSame(backOff, new DirectFieldAccessor(container).getPropertyValue("backOff"));
 	}
 
+	@Test
+	public void endpointConcurrencyTakesPrecedence() {
+		DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory();
+		factory.setConcurrency("2-10");
+
+		SimpleJmsListenerEndpoint endpoint = new SimpleJmsListenerEndpoint();
+		MessageListener messageListener = new MessageListenerAdapter();
+		endpoint.setMessageListener(messageListener);
+		endpoint.setDestination("myQueue");
+		endpoint.setConcurrency("4-6");
+		DefaultMessageListenerContainer container = factory.createListenerContainer(endpoint);
+		assertEquals(4, container.getConcurrentConsumers());
+		assertEquals(6, container.getMaxConcurrentConsumers());
+	}
+
 
 	private void setDefaultJmsConfig(AbstractJmsListenerContainerFactory<?> factory) {
 		factory.setConnectionFactory(this.connectionFactory);