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

CachedSessionInvocationHandler includes durable flag in ConsumerCacheKey

Browse Source 
Issue: SPR-11956
This commit is contained in:
Juergen Hoeller
2014-07-05 08:49:28 +02:00
parent 6c41cc354c
commit 6fd0fc7005
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java
View File

@@ -403,7 +403,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
private MessageConsumer getCachedConsumer( private MessageConsumer getCachedConsumer(
Destination dest, String selector, Boolean noLocal, String subscription, boolean durable) throws JMSException { Destination dest, String selector, Boolean noLocal, String subscription, boolean durable) throws JMSException {
ConsumerCacheKey cacheKey = new ConsumerCacheKey(dest, selector, noLocal, subscription); ConsumerCacheKey cacheKey = new ConsumerCacheKey(dest, selector, noLocal, subscription, durable);
MessageConsumer consumer = this.cachedConsumers.get(cacheKey); MessageConsumer consumer = this.cachedConsumers.get(cacheKey);
if (consumer != null) { if (consumer != null) {
if (logger.isTraceEnabled()) { if (logger.isTraceEnabled()) {
@@ -554,11 +554,14 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
private final String subscription; private final String subscription;
public ConsumerCacheKey(Destination destination, String selector, Boolean noLocal, String subscription) { private final boolean durable;
public ConsumerCacheKey(Destination destination, String selector, Boolean noLocal, String subscription, boolean durable) {
super(destination); super(destination);
this.selector = selector; this.selector = selector;
this.noLocal = noLocal; this.noLocal = noLocal;
this.subscription = subscription; this.subscription = subscription;
this.durable = durable;
} }
@Override @Override
@@ -570,7 +573,8 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
return (destinationEquals(otherKey) && return (destinationEquals(otherKey) &&
ObjectUtils.nullSafeEquals(this.selector, otherKey.selector) && ObjectUtils.nullSafeEquals(this.selector, otherKey.selector) &&
ObjectUtils.nullSafeEquals(this.noLocal, otherKey.noLocal) && ObjectUtils.nullSafeEquals(this.noLocal, otherKey.noLocal) &&
ObjectUtils.nullSafeEquals(this.subscription, otherKey.subscription)); ObjectUtils.nullSafeEquals(this.subscription, otherKey.subscription) &&
this.durable == otherKey.durable);
} }
} }