Author: sebb Date: Sun Nov 15 01:25:19 2009 New Revision: 836307 URL: http://svn.apache.org/viewvc?rev=836307&view=rev Log: Tidy up
Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java?rev=836307&r1=836306&r2=836307&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java (original) +++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java Sun Nov 15 01:25:19 2009 @@ -80,11 +80,7 @@ testEnded(); } - /** - * endTest cleans up the client - * - * @see junit.framework.TestListener#endTest(junit.framework.Test) - */ + /** {...@inheritdoc} */ public synchronized void testEnded() { ConnectionFactory.factory = null;//N.B. static reference } Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java?rev=836307&r1=836306&r2=836307&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java (original) +++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java Sun Nov 15 01:25:19 2009 @@ -33,7 +33,7 @@ public class MessageAdmin { private static final MessageAdmin SINGLETON = new MessageAdmin(); - private Map<String, PlaceHolder> table = new Hashtable<String, PlaceHolder>(); + private final Map<String, PlaceHolder> table = new Hashtable<String, PlaceHolder>(); private static final Logger log = LoggingManager.getLoggerForClass(); Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java?rev=836307&r1=836306&r2=836307&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java (original) +++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java Sun Nov 15 01:25:19 2009 @@ -30,7 +30,7 @@ public class Receiver implements Runnable { private static final Logger log = LoggingManager.getLoggerForClass(); - private boolean active; + private volatile boolean active; private final QueueSession session; @@ -65,10 +65,10 @@ } public void run() { - activate(); + active = true; Message reply; - while (isActive()) { + while (active) { reply = null; try { reply = consumer.receive(5000); @@ -111,16 +111,8 @@ } } - public synchronized void activate() { - active = true; - } - - public synchronized void deactivate() { + public void deactivate() { active = false; } - private synchronized boolean isActive() { - return active; - } - } --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org