Author: fschumacher
Date: Sat Jan 31 11:10:57 2015
New Revision: 1656184
URL: http://svn.apache.org/r1656184
Log:
Bug: 57110
Simplify logic to make it even more efficient.
Bugzilla Id: 57110
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java?rev=1656184&r1=1656183&r2=1656184&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
Sat Jan 31 11:10:57 2015
@@ -221,20 +221,13 @@ public class LogFilter implements Filter
*/
@Override
public boolean isFiltered(String path,TestElement el) {
- // we do a quick check to see if any
- // filters are set. If not we just
- // return false to be efficient.
- if (this.FILEFILTER || this.PTRNFILTER || this.CHANGEEXT) {
- if (this.FILEFILTER) {
- return filterFile(path);
- } else if (this.PTRNFILTER) {
- return filterPattern(path);
- } else {
- return false;
- }
- } else {
- return false;
+ if (this.FILEFILTER) {
+ return filterFile(path);
}
+ if (this.PTRNFILTER) {
+ return filterPattern(path);
+ }
+ return false;
}
/**
