Author: sebb
Date: Mon Apr 26 14:35:07 2010
New Revision: 938062

URL: http://svn.apache.org/viewvc?rev=938062&view=rev
Log:
Bug 49111 - "Message With ID Not Found" Error on JMS P2P sampler.
Partial fix (can still fail if "Use Request Message Id As Correlation Id" is 
selected)

Modified:
    
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java
    jakarta/jmeter/trunk/xdocs/changes.xml

Modified: 
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java?rev=938062&r1=938061&r2=938062&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java
 (original)
+++ 
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java
 Mon Apr 26 14:35:07 2010
@@ -84,13 +84,16 @@ public class FixedQueueExecutor implemen
             log.error("Correlation id is null. Set the JMSCorrelationID 
header");
             return null;
         }
-        producer.send(request);
 
-        if(useReqMsgIdAsCorrelId) {
-            id = request.getJMSMessageID();
+        if(useReqMsgIdAsCorrelId) {// msgId not available until after send() 
is called
+            producer.send(request); // TODO - fix timing bug see Bugzilla 49111
+            id=request.getJMSMessageID();
+            MessageAdmin.getAdmin().putRequest(id, request);            
+        } else {
+            MessageAdmin.getAdmin().putRequest(id, request);            
+            producer.send(request);
         }
 
-        MessageAdmin.getAdmin().putRequest(id, request);
         try {
             if (log.isDebugEnabled()) {
                 log.debug("wait for reply " + id + " started on " + 
System.currentTimeMillis());

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=938062&r1=938061&r2=938062&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Mon Apr 26 14:35:07 2010
@@ -98,6 +98,7 @@ The XPath Assertion and XPath Extractor 
 <li>Bug 48573 - LDAPExtSampler directory context handling</li>
 <li>Bug 48579 - Single Bind does not show config information when LdapExt 
Sampler is accessed</li>
 <li>Bug 48747 - TCP Sampler swallows exceptions</li>
+<li>Bug 49111 - "Message With ID Not Found" Error on JMS P2P sampler. Partial 
fix (can still fail if "Use Request Message Id As Correlation Id" is 
selected)</li>
 </ul>
 
 <h3>Controllers</h3>


Reply via email to