Author: pmouawad
Date: Sat Oct 8 19:06:06 2011
New Revision: 1180462
URL: http://svn.apache.org/viewvc?rev=1180462&view=rev
Log:
Bug 51691 - Authorization does not work for JMS Publisher and JMS Subscriber
Adding some comments just to clarify why 51996 fix fixes this NPE issue
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=1180462&r1=1180461&r2=1180462&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 19:06:06 2011
@@ -71,8 +71,10 @@ public class InitialContextFactory {
throw new NamingException(e.toString());
}
// we want to return the context that is actually in the map
+ // if it's the first put we will have a null result
Context oldCtx = MAP.putIfAbsent(cacheKey, ctx);
if(oldCtx != null) {
+ // There was an object in map, destroy the temporary and
return one in map (oldCtx)
try {
ctx.close();
} catch (Exception e) {
@@ -80,6 +82,7 @@ public class InitialContextFactory {
}
ctx = oldCtx;
}
+ // else No object in Map, ctx is the one
}
return ctx;
}
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1180462&r1=1180461&r2=1180462&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Sat Oct 8 19:06:06 2011
@@ -95,6 +95,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>
+<li>Bug 51691 - Authorization does not work for JMS Publisher and JMS
Subscriber</li>
</ul>
<h3>Controllers</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
