seade 2003/01/06 18:09:50
Modified: src/components/org/apache/jmeter/assertions
ResponseAssertion.java
Log:
Made PatternCache static and used READ_ONLY patterns - this fixes a NPE that occurs
in remote sessions.
Revision Changes Path
1.3 +9 -10
jakarta-jmeter/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
Index: ResponseAssertion.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/ResponseAssertion.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResponseAssertion.java 3 Jan 2003 03:04:38 -0000 1.2
+++ ResponseAssertion.java 7 Jan 2003 02:09:50 -0000 1.3
@@ -57,7 +57,6 @@
import java.util.*;
import java.io.Serializable;
import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.config.ConfigElement;
import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.oro.text.PatternCacheLRU;
@@ -92,15 +91,15 @@
public final static int CONTAINS = 1 << 1;
public final static int NOT = 1 << 2;
- private transient static ThreadLocal matcher =
+ private static ThreadLocal matcher =
new ThreadLocal()
{
- protected Object initialValue()
- {
- return new Perl5Matcher();
- }
+ protected Object initialValue()
+ {
+ return new Perl5Matcher();
+ }
};
- private transient PatternCacheLRU patternCache =
+ private static PatternCacheLRU patternCache =
new PatternCacheLRU(1000, new Perl5Compiler());
/************************************************************
@@ -314,7 +313,7 @@
while (iter.hasNext())
{
String stringPattern= (String) iter.next();
- Pattern pattern = patternCache.getPattern(stringPattern);
+ Pattern pattern = patternCache.getPattern(stringPattern,
Perl5Compiler.READ_ONLY_MASK);
boolean found;
if ((CONTAINS & getTestType()) > 0)
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
