mstover1 2004/06/08 14:41:02
Modified: src/core/org/apache/jmeter/util JMeterVersion.java
src/protocol/http/org/apache/jmeter/protocol/http/sampler
AccessLogSampler.java
src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog
TCLogParser.java
Log:
Fixing access log sampler session filter
Revision Changes Path
1.21 +3 -3
jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterVersion.java
Index: JMeterVersion.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterVersion.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JMeterVersion.java 28 May 2004 21:09:13 -0000 1.20
+++ JMeterVersion.java 8 Jun 2004 21:41:02 -0000 1.21
@@ -41,7 +41,7 @@
* pattern: VERSION = <quote>.*<quote>
*
*/
- static final String VERSION = "2.0.20040528";
+ static final String VERSION = "2.0.20040608";
private JMeterVersion() // Not instantiable
{
1.13 +8 -5
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
Index: AccessLogSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AccessLogSampler.java 6 Jun 2004 22:24:57 -0000 1.12
+++ AccessLogSampler.java 8 Jun 2004 21:41:02 -0000 1.13
@@ -140,7 +140,7 @@
int thisCount = PARSER.parseAndConfigure(1, this);
if (thisCount == 0)
{
- if(count == 0)
+ if (count == 0)
{
JMeterContextService.getContext().getThread().stop();
}
@@ -313,10 +313,13 @@
if (TestCloneable.class.isAssignableFrom(Class
.forName(filterClassName)))
{
- filter = (Filter) Class.forName(filterClassName).newInstance();
+ if (filter == null)
+ {
+ filter = (Filter) Class.forName(filterClassName)
+ .newInstance();
+ }
s.filter = (Filter) ((TestCloneable) filter).clone();
}
-
}
catch (Exception e)
{
1.14 +3 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
Index: TCLogParser.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TCLogParser.java 28 May 2004 21:09:14 -0000 1.13
+++ TCLogParser.java 8 Jun 2004 21:41:02 -0000 1.14
@@ -256,6 +256,7 @@
{
break;
}
+ line = breader.readLine();
}
}
catch (IOException ioe)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
