Updated script details and added guard for trafficlight being null.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@500284 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 15 insertions, 14 deletions

diff --git a/java/perftests/src/main/java/perftests.log4j b/java/perftests/src/main/java/perftests.log4j
index a6e1bd5452..3bd8c201f8 100644
--- a/java/perftests/src/main/java/perftests.log4j
+++ b/java/perftests/src/main/java/perftests.log4j
@@ -24,19 +24,19 @@ log4j.additivity.org.apache.qpid=false
 

 log4j.logger.org.apache.qpid.requestreply=${amqj.test.logging.level}

 log4j.logger.org.apache.qpid.pingpong=${amqj.test.logging.level}

+log4j.logger.org.apache.qpid.ping=${amqj.test.logging.level}

 log4j.logger.org.apache.qpid.topic=${amqj.test.logging.level}

 

 

-log4j.logger.uk.co.thebadgerset.junit.extensions=info, console

+log4j.logger.uk.co.thebadgerset.junit.extensions=${badger.level}, console

 log4j.additivity.uk.co.thebadgerset.junit.extensions=false

-log4j.logger.uk.co.thebadgerset.junit.extensions=info

 

 log4j.appender.console=org.apache.log4j.ConsoleAppender

 log4j.appender.console.Threshold=all

 log4j.appender.console.layout=org.apache.log4j.PatternLayout

 

-#log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n

-log4j.appender.console.layout.ConversionPattern=%p [%c] %m%n

+log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n

+#log4j.appender.console.layout.ConversionPattern=%t %p [%c] %m%n

 

 log4j.appender.fileApp=org.apache.log4j.FileAppender

 log4j.appender.fileApp.file=${log.dir}/perftests.volumetest.log

diff --git a/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java b/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java
index a5647babff..bd39ec34a1 100644
--- a/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java
+++ b/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java
@@ -33,7 +33,6 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.apache.log4j.Logger;
 
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.CountDownLatch;
 
@@ -267,18 +266,20 @@ public class PingAsyncTestPerf extends PingTestPerf //implements TimingControlle
 //
 //                CountDownLatch count = _perThreadSetup._pingItselfClient.getEndLock(message.getJMSCorrelationID());
 //
-//                int messagesLeft = (int) count.getCount() - 1;// minus one as we haven't yet counted the current message
-//
-//                if ((messagesLeft % _batchSize) == 0)
-//                {
-//                    doDone(_batchSize);
-//                }
-//                else if (messagesLeft == 0)
+//                if (count != null)
 //                {
-//                    doDone(_totalMessages % _batchSize);
+//                    int messagesLeft = (int) count.getCount() - 1;// minus one as we haven't yet counted the current message
+//
+//                    if ((messagesLeft % _batchSize) == 0)
+//                    {
+//                        doDone(_batchSize);
+//                    }
+//                    else if (messagesLeft == 0)
+//                    {
+//                        doDone(_totalMessages % _batchSize);
+//                    }
 //                }
 //
-//
 //            }
 //            catch (JMSException e)
 //            {