root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

revised JMS CachedConnectionFactory to avoid unnecessary rollback calls on Session return (SPR-8437); fixed JMS CachedConnectionFactory to fully synchronize its Session list (SPR-8436)

This commit is contained in:
Juergen Hoeller 2011-06-13 21:42:11 +00:00
parent 883ac319bc
commit 168d9648b9
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.springframework.jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2010 the original author or authors. * Copyright 2002-2011 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -312,7 +312,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
else if (methodName.equals("commit") || methodName.equals("rollback")) { else if (methodName.equals("commit") || methodName.equals("rollback")) {
this.transactionOpen = false; this.transactionOpen = false;
} }
else { else if (methodName.startsWith("create")) {
this.transactionOpen = true; this.transactionOpen = true;
if (isCacheProducers() && (methodName.equals("createProducer") || if (isCacheProducers() && (methodName.equals("createProducer") ||
methodName.equals("createSender") || methodName.equals("createPublisher"))) { methodName.equals("createSender") || methodName.equals("createPublisher"))) {
@ -408,11 +408,15 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
} }
} }
// Allow for multiple close calls... // Allow for multiple close calls...
if (!this.sessionList.contains(proxy)) { boolean returned = false;
if (logger.isTraceEnabled()) { synchronized (this.sessionList) {
logger.trace("Returning cached Session: " + this.target); if (!this.sessionList.contains(proxy)) {
this.sessionList.addLast(proxy);
returned = true;
} }
this.sessionList.addLast(proxy); }
if (returned && logger.isTraceEnabled()) {
logger.trace("Returned cached Session: " + this.target);
} }
} }