aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-batch
diff options
context:
space:
mode:
authorsimonbrandhof <simon.brandhof@gmail.com>2011-02-07 15:49:19 +0100
committersimonbrandhof <simon.brandhof@gmail.com>2011-02-07 15:49:19 +0100
commit5da7732516fb007169e9765fbcf765cfb92fe57d (patch)
tree783ce3e4b9dedb5d76920f89e51f9eb359ef655c /sonar-batch
parentc07d90eea0a359fc37a7f49ab6ad6ea0a13d18b8 (diff)
downloadsonarqube-5da7732516fb007169e9765fbcf765cfb92fe57d.tar.gz
sonarqube-5da7732516fb007169e9765fbcf765cfb92fe57d.zip
Do not execute ResourceFilters on resources with scope<file
Diffstat (limited to 'sonar-batch')
-rw-r--r--sonar-batch/src/main/java/org/sonar/batch/ResourceFilters.java19
1 files changed, 11 insertions, 8 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/ResourceFilters.java b/sonar-batch/src/main/java/org/sonar/batch/ResourceFilters.java
index eeb15175918..ee6522417dc 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/ResourceFilters.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/ResourceFilters.java
@@ -23,6 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonar.api.batch.ResourceFilter;
import org.sonar.api.resources.Resource;
+import org.sonar.api.resources.Scopes;
/**
* @since 1.12
@@ -34,7 +35,7 @@ public class ResourceFilters {
private ResourceFilter[] filters;
public ResourceFilters(ResourceFilter[] filters) {
- this.filters = (filters==null ? new ResourceFilter[0] : filters);
+ this.filters = (filters == null ? new ResourceFilter[0] : filters);
}
public ResourceFilters() {
@@ -50,14 +51,16 @@ public class ResourceFilters {
*/
public boolean isExcluded(Resource resource) {
boolean ignored = false;
- int index = 0;
- while (!ignored && index < filters.length) {
- ResourceFilter filter = filters[index];
- ignored = filter.isIgnored(resource);
- if (ignored && LOG.isDebugEnabled()) {
- LOG.debug("Resource {} is excluded by the filter {}", resource, filter);
+ if (Scopes.isHigherThanOrEquals(resource, Scopes.FILE)) {
+ int index = 0;
+ while (!ignored && index < filters.length) {
+ ResourceFilter filter = filters[index];
+ ignored = filter.isIgnored(resource);
+ if (ignored && LOG.isDebugEnabled()) {
+ LOG.debug("Resource {} is excluded by the filter {}", resource, filter);
+ }
+ index++;
}
- index++;
}
return ignored;
}