Author: sebb
Date: Wed Jan  9 09:39:55 2008
New Revision: 610480

URL: http://svn.apache.org/viewvc?rev=610480&view=rev
Log:
Bug 44144 - JMS point-to-point: request response test does not work

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=610480&r1=610479&r2=610480&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
 Wed Jan  9 09:39:55 2008
@@ -29,9 +29,6 @@
  * Request/reply executor with a fixed reply queue. <br>
  * Created on: October 28, 2004
  * 
- * @author Martijn Blankestijn
- * @version $Id: FixedQueueExecutor.java,v 1.3 2005/05/19 15:36:53 mblankestijn
- *          Exp $
  */
 public class FixedQueueExecutor implements QueueExecutor {
        /** Sender. */
@@ -61,8 +58,12 @@
         * @see 
org.apache.jmeter.protocol.jms.sampler.QueueExecutor#sendAndReceive(javax.jms.Message)
         */
        public Message sendAndReceive(Message request) throws JMSException {
+               String id = request.getJMSCorrelationID();
+               if(id == null){
+                   log.error("Correlation id is null. Set the JMSCorrelationID 
header");
+                   return null;
+               }
                producer.send(request);
-               String id = request.getJMSMessageID();
                MessageAdmin.getAdmin().putRequest(id, request);
                try {
                        if (log.isDebugEnabled()) {
@@ -78,6 +79,6 @@
                } catch (InterruptedException e) {
                        log.warn("Interrupt exception caught", e);
                }
-               return MessageAdmin.getAdmin().get(request.getJMSMessageID());
+               return MessageAdmin.getAdmin().get(id);
        }
-}
+}
\ No newline at end of file

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=610480&r1=610479&r2=610480&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Wed Jan  9 09:39:55 2008
@@ -69,6 +69,7 @@
 <li>Bug 44042 - Regression in Cookie Manager (Bug introduced in 2.3.1)</li>
 <li>Bug 41028 - JMeter server doesn't alert the user when the host is defined 
as a loopback address</li>
 <li>Bug 44142 - Function __machineName causes NPE if parameters are 
omitted.</li>
+<li>Bug 44144 - JMS point-to-point: request response test does not work</li>
 </ul>
 
 <h4>Improvements</h4>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to