svn commit: r1197424 - in /jmeter/trunk: src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java xdocs/usermanual/component_reference.xml

[pm...@apache.org]

Author: pmouawad
Date: Fri Nov  4 08:30:42 2011
New Revision: 1197424

URL: http://svn.apache.org/viewvc?rev=1197424&view=rev
Log:
Bug 52052 - Using a delimiter to separate result-messages for JMS Subscriber

Fixed Sebb comments

Modified:
    jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
    jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java?rev=1197424&r1=1197423&r2=1197424&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java Fri Nov  4 08:30:42 2011
@@ -93,7 +93,7 @@ public class SubscriberSampler extends B
     
     private transient boolean START_ON_SAMPLE = false;
 
-	private volatile String separator;
+	private transient String separator;
 
     public SubscriberSampler() {
         super();

Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1197424&r1=1197423&r2=1197424&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Fri Nov  4 08:30:42 2011
@@ -1336,6 +1336,10 @@ The following table shows some values wh
   This may be useful in some cases where multiple samples/threads have connections to the same queue.
   If not selected, JMeter calls Connection.start() at the start of the thread, and does not call stop() until the end of the thread.
   </property>
+  <property name="Separator" required="No">
+  Separator used to separate messages when there is more than one (related to setting Number of samples to aggregate).
+  Note that \n, \r, \t are accepted.
+  </property>
 </properties>
 <p>
 <b>NOTE:</b> JMeter 2.3.4 and earlier used a different strategy for the MessageConsumer.receive() client.