From commits-return-104-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Thu Nov 10 21:51:00 2011 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2405D91A1 for ; Thu, 10 Nov 2011 21:51:00 +0000 (UTC) Received: (qmail 69586 invoked by uid 500); 10 Nov 2011 21:51:00 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 69567 invoked by uid 500); 10 Nov 2011 21:51:00 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 69560 invoked by uid 99); 10 Nov 2011 21:51:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2011 21:51:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2011 21:50:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A5B2423889D7 for ; Thu, 10 Nov 2011 21:50:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1200586 - /jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java Date: Thu, 10 Nov 2011 21:50:38 -0000 To: commits@jmeter.apache.org From: pmouawad@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111110215038.A5B2423889D7@eris.apache.org> Author: pmouawad Date: Thu Nov 10 21:50:38 2011 New Revision: 1200586 URL: http://svn.apache.org/viewvc?rev=1200586&view=rev Log: Bug 52052 - Using a delimiter to separate result-messages for JMS Subscriber There was an issue when following options were checked: - stopBetweenSamples - Read Response Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java 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=1200586&r1=1200585&r2=1200586&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 Thu Nov 10 21:50:38 2011 @@ -25,6 +25,7 @@ import javax.jms.Message; import javax.jms.TextMessage; import javax.naming.NamingException; +import org.apache.commons.lang.StringUtils; import org.apache.jmeter.engine.event.LoopIterationEvent; import org.apache.jmeter.protocol.jms.Utils; import org.apache.jmeter.protocol.jms.client.InitialContextFactory; @@ -110,6 +111,7 @@ public class SubscriberSampler extends B SUBSCRIBER = new ReceiveSubscriber(0, getUseJNDIPropertiesAsBoolean(), getJNDIInitialContextFactory(), getProviderUrl(), getConnectionFactory(), getDestination(), getDurableSubscriptionId(), getClientId(), getJmsSelector(), isUseAuth(), getUsername(), getPassword()); + setupSeparator(); log.debug("SubscriberSampler.initListenerClient called"); } @@ -122,6 +124,7 @@ public class SubscriberSampler extends B SUBSCRIBER = new ReceiveSubscriber(getUseJNDIPropertiesAsBoolean(), getJNDIInitialContextFactory(), getProviderUrl(), getConnectionFactory(), getDestination(), getDurableSubscriptionId(), getClientId(), getJmsSelector(), isUseAuth(), getUsername(), getPassword()); + setupSeparator(); log.debug("SubscriberSampler.initReceiveClient called"); } @@ -250,7 +253,10 @@ public class SubscriberSampler extends B } } Utils.messageProperties(propBuffer, msg); - propBuffer.append(separator); + if(!StringUtils.isEmpty(separator)) { + propBuffer.append(separator); + buffer.append(separator); + } } catch (JMSException e) { log.error(e.getMessage()); } @@ -450,24 +456,30 @@ public class SubscriberSampler extends B * {@inheritDoc} */ public void testIterationStart(LoopIterationEvent event) { - //NOOP + // NOOP } /** * {@inheritDoc} */ public void testStarted() { - separator = getSeparator(); - separator = separator.replace("\\t", "\t"); - separator = separator.replace("\\n", "\n"); - separator = separator.replace("\\r", "\r"); + testStarted(""); } /** * {@inheritDoc} */ public void testStarted(String host) { - // NOOP + // NOOP } -} + /** + * + */ + private void setupSeparator() { + separator = getSeparator(); + separator = separator.replace("\\t", "\t"); + separator = separator.replace("\\n", "\n"); + separator = separator.replace("\\r", "\r"); + } +} \ No newline at end of file