Author: pmouawad
Date: Sat Oct 8 08:00:59 2011
New Revision: 1180335
URL: http://svn.apache.org/viewvc?rev=1180335&view=rev
Log:
Bug 51996 - JMS Initial Context leak newly created Context when Multiple Thread
enter InitialContextFactory#lookupContext at the same time
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java?rev=1180335&r1=1180334&r2=1180335&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
Sat Oct 8 08:00:59 2011
@@ -71,7 +71,15 @@ public class InitialContextFactory {
throw new NamingException(e.toString());
}
// we want to return the context that is actually in the map
- ctx = MAP.putIfAbsent(cacheKey, ctx);
+ Context oldCtx = MAP.putIfAbsent(cacheKey, ctx);
+ if(oldCtx != null) {
+ try {
+ ctx.close();
+ } catch (Exception e) {
+ // NOOP
+ }
+ ctx = oldCtx;
+ }
}
return ctx;
}
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1180335&r1=1180334&r2=1180335&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Sat Oct 8 08:00:59 2011
@@ -94,6 +94,7 @@ Mirror server now uses default port 8081
<h3>Other Samplers</h3>
<ul>
+<li>Bug 51996 - JMS Initial Context leak newly created Context when Multiple
Thread enter InitialContextFactory#lookupContext at the same time</li>
</ul>
<h3>Controllers</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
