You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/05/02 15:39:15 UTC

svn commit: r940220 - /jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java

Author: sebb
Date: Sun May  2 13:39:15 2010
New Revision: 940220

URL: http://svn.apache.org/viewvc?rev=940220&view=rev
Log:
Add SampleResult request and response headers

Modified:
    jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java

Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java?rev=940220&r1=940219&r2=940220&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java Sun May  2 13:39:15 2010
@@ -40,6 +40,7 @@ import javax.naming.NamingException;
 
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.engine.event.LoopIterationEvent;
+import org.apache.jmeter.protocol.jms.Utils;
 import org.apache.jmeter.samplers.AbstractSampler;
 import org.apache.jmeter.samplers.Entry;
 import org.apache.jmeter.samplers.SampleResult;
@@ -130,15 +131,16 @@ public class JMSSampler extends Abstract
         SampleResult res = new SampleResult();
         res.setSampleLabel(getName());
         res.setSamplerData(getContent());
+        res.setSuccessful(false); // Assume failure
         res.setDataType(SampleResult.TEXT);
         res.sampleStart();
 
         try {
             TextMessage msg = createMessage();
-
             if (isOneway()) {
                 producer.send(msg);
-                res.setSuccessful(true);
+                res.setRequestHeaders(Utils.messageProperties(msg));
+                res.setResponseOK();
                 res.setResponseData("Oneway request has no response data", null);
             } else {
                 if (!useTemporyQueue()) {
@@ -146,8 +148,8 @@ public class JMSSampler extends Abstract
                 }
 
                 Message replyMsg = executor.sendAndReceive(msg);
+                res.setRequestHeaders(Utils.messageProperties(msg));
                 if (replyMsg == null) {
-                    res.setSuccessful(false);
                     res.setResponseMessage("No reply message received");
                 } else {
                     if (replyMsg instanceof TextMessage) {
@@ -155,6 +157,7 @@ public class JMSSampler extends Abstract
                     } else {
                         res.setResponseData(replyMsg.toString(), null);
                     }
+                    res.setResponseHeaders(Utils.messageProperties(replyMsg));
                     res.setResponseOK();
                 }
             }
@@ -165,7 +168,6 @@ public class JMSSampler extends Abstract
             } else {                
                 res.setResponseMessage(e.getLocalizedMessage());
             }
-            res.setSuccessful(false);
         }
         res.sampleEnd();
         return res;