Author: sebb
Date: Sat Mar 3 18:03:30 2007
New Revision: 514325
URL: http://svn.apache.org/viewvc?view=rev&rev=514325
Log:
Catch CachePattern Exception instead of all Exceptions
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/RegexFunction.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/RegexFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/RegexFunction.java?view=diff&rev=514325&r1=514324&r2=514325
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/RegexFunction.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/RegexFunction.java
Sat Mar 3 18:03:30 2007
@@ -35,6 +35,7 @@
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
+import org.apache.oro.text.MalformedCachePatternException;
import org.apache.oro.text.regex.MatchResult;
import org.apache.oro.text.regex.Pattern;
import org.apache.oro.text.regex.PatternMatcher;
@@ -120,7 +121,7 @@
if (values.length > 5) {
name = ((CompoundVariable) values[values.length
- 1]).execute();
}
- } catch (Exception e) {
+ } catch (MalformedCachePatternException e) {
throw new InvalidVariableException(e.toString());
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java?view=diff&rev=514325&r1=514324&r2=514325
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
Sat Mar 3 18:03:30 2007
@@ -23,6 +23,7 @@
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
+import org.apache.oro.text.MalformedCachePatternException;
import org.apache.oro.text.regex.Pattern;
import org.apache.oro.text.regex.Perl5Compiler;
@@ -406,7 +407,7 @@
try {
return JMeterUtils.getPatternCache().getPattern(pattern,
Perl5Compiler.READ_ONLY_MASK |
Perl5Compiler.SINGLELINE_MASK);
- } catch (Exception exception) {
+ } catch (MalformedCachePatternException exception) {
exception.printStackTrace();
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
