Author: sebb
Date: Wed Nov 2 16:53:48 2005
New Revision: 330397
URL: http://svn.apache.org/viewcvs?rev=330397&view=rev
Log:
Allow serialisation to be checked
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/BatchSampleSender.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StandardSampleSender.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/BatchSampleSender.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/BatchSampleSender.java?rev=330397&r1=330396&r2=330397&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/BatchSampleSender.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/BatchSampleSender.java
Wed Nov 2 16:53:48 2005
@@ -32,7 +32,7 @@
* @author Michael Freeman
*/
public class BatchSampleSender implements SampleSender, Serializable {
- transient private static Logger log =
LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggingManager.getLoggerForClass();
private static final int DEFAULT_NUM_SAMPLE_THRESHOLD = 100;
@@ -48,6 +48,9 @@
private long batchSendTime = -1;
+ public BatchSampleSender(){
+ log.warn("Constructor only intended for use in testing"); //
$NON-NLS-1$
+ }
/**
* Constructor
*
@@ -57,9 +60,9 @@
BatchSampleSender(RemoteSampleListener listener) {
this.listener = listener;
init();
- log
- .info("Using batching for this run." + "
Thresholds: num=" + numSamplesThreshold + ", time="
- + timeThreshold);
+ log.info("Using batching for this run."
+ + " Thresholds: num=" + numSamplesThreshold
+ + ", time=" + timeThreshold);
}
/**
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/HoldSampleSender.java?rev=330397&r1=330396&r2=330397&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
Wed Nov 2 16:53:48 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-20045 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,12 +31,16 @@
*/
public class HoldSampleSender implements SampleSender, Serializable {
- transient private static Logger log =
LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggingManager.getLoggerForClass();
- List sampleStore = new ArrayList();
+ private List sampleStore = new ArrayList();
- RemoteSampleListener listener;
+ private RemoteSampleListener listener;
+ public HoldSampleSender(){
+ log.warn("Constructor only intended for use in testing"); //
$NON-NLS-1$
+ }
+
HoldSampleSender(RemoteSampleListener listener) {
log.info("Using Sample store for this test run");
this.listener = listener;
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StandardSampleSender.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StandardSampleSender.java?rev=330397&r1=330396&r2=330397&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StandardSampleSender.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StandardSampleSender.java
Wed Nov 2 16:53:48 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,11 +28,15 @@
*/
public class StandardSampleSender implements SampleSender, Serializable {
- transient private static Logger log =
LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggingManager.getLoggerForClass();
- RemoteSampleListener listener;
+ private RemoteSampleListener listener;
- StandardSampleSender(RemoteSampleListener listener) {
+ public StandardSampleSender(){
+ log.warn("Constructor only intended for use in testing"); //
$NON-NLS-1$
+ }
+
+ StandardSampleSender(RemoteSampleListener listener) {
log.info("Using Standard Remote Sampler for this test run");
this.listener = listener;
}
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java?rev=330397&r1=330396&r2=330397&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java
Wed Nov 2 16:53:48 2005
@@ -19,15 +19,23 @@
import java.io.Serializable;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
+
/**
* @author Lars Krog-Jensen
* Created: 2005-okt-04
*/
public class StatisticalSampleResult extends SampleResult implements
Serializable {
+ private static final Logger log = LoggingManager.getLoggerForClass();
+
+ private int errorCount;
- protected int errorCount;
-
+ public StatisticalSampleResult(){
+ log.warn("Constructor only intended for use in testing"); // $NON-NLS-1$
+ }
+
public StatisticalSampleResult(SampleResult res) {
setSampleLabel(res.getSampleLabel());
}
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java?rev=330397&r1=330396&r2=330397&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java
Wed Nov 2 16:53:48 2005
@@ -35,7 +35,7 @@
* Created: 2005-okt-04
*/
public class StatisticalSampleSender implements SampleSender, Serializable {
- transient private static Logger log =
LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggingManager.getLoggerForClass();
private static final int DEFAULT_NUM_SAMPLE_THRESHOLD = 100;
@@ -54,6 +54,11 @@
private long timeThreshold;
private long batchSendTime = -1;
+
+ public StatisticalSampleSender(){
+ log.warn("Constructor only intended for use in testing");
+ }
+
/**
* Constructor
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
