Author: sebb
Date: Tue Jun 22 23:51:40 2010
New Revision: 957083
URL: http://svn.apache.org/viewvc?rev=957083&view=rev
Log:
Store request message headers
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java?rev=957083&r1=957082&r2=957083&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
Tue Jun 22 23:51:40 2010
@@ -19,11 +19,15 @@
package org.apache.jmeter.protocol.jms.client;
import java.io.Serializable;
+import java.util.Map;
+import java.util.Map.Entry;
+
import javax.naming.Context;
import javax.naming.NamingException;
import javax.jms.Connection;
import javax.jms.Destination;
import javax.jms.JMSException;
+import javax.jms.MapMessage;
import javax.jms.MessageProducer;
import javax.jms.ObjectMessage;
import javax.jms.Session;
@@ -69,22 +73,25 @@ public class Publisher {
log.info("created the topic connection successfully");
}
- public void publish(String text) {
- try {
- TextMessage msg = session.createTextMessage(text);
- producer.send(msg);
- } catch (JMSException e) {
- log.error(e.getMessage());
- }
+ public TextMessage publish(String text) throws JMSException {
+ TextMessage msg = session.createTextMessage(text);
+ producer.send(msg);
+ return msg;
+ }
+
+ public ObjectMessage publish(Serializable contents) throws JMSException {
+ ObjectMessage msg = session.createObjectMessage(contents);
+ producer.send(msg);
+ return msg;
}
- public void publish(Serializable contents) {
- try {
- ObjectMessage msg = session.createObjectMessage(contents);
- producer.send(msg);
- } catch (JMSException e) {
- log.error(e.getMessage());
+ public MapMessage publish(Map<String, Object> map) throws JMSException {
+ MapMessage msg = session.createMapMessage();
+ for (Entry<String, Object> me : map.entrySet()){
+ msg.setObject(me.getKey(), me.getValue());
}
+ producer.send(msg);
+ return msg;
}
/**
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java?rev=957083&r1=957082&r2=957083&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
Tue Jun 22 23:51:40 2010
@@ -18,6 +18,7 @@
package org.apache.jmeter.protocol.jms.sampler;
import javax.jms.JMSException;
+import javax.jms.Message;
import javax.naming.NamingException;
import org.apache.jorphan.io.TextFile;
@@ -28,6 +29,7 @@ import org.apache.jmeter.testelement.Tes
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.engine.event.LoopIterationEvent;
+import org.apache.jmeter.protocol.jms.Utils;
import org.apache.jmeter.protocol.jms.control.gui.JMSPublisherGui;
import org.apache.jmeter.protocol.jms.client.ClientPool;
import org.apache.jmeter.protocol.jms.client.Publisher;
@@ -147,19 +149,22 @@ public class PublisherSampler extends Ba
}
}
StringBuilder buffer = new StringBuilder();
+ StringBuilder propBuffer = new StringBuilder();
int loop = getIterationCount();
result.sampleStart();
try {
for (int idx = 0; idx < loop; idx++) {
String tmsg = getMessageContent();
- publisher.publish(tmsg);
+ Message msg = publisher.publish(tmsg);
buffer.append(tmsg);
+ Utils.messageProperties(propBuffer, msg);
}
result.setResponseCodeOK();
result.setResponseMessage(loop + " messages published");
result.setSuccessful(true);
result.setSamplerData(buffer.toString());
result.setSampleCount(loop);
+ result.setRequestHeaders(propBuffer.toString());
} catch (Exception e) {
result.setResponseMessage(e.toString());
} finally {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
