diff --git a/CONTRIBUTORS b/CONTRIBUTORS index b4f91e603..aca7b5e3d 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -103,6 +103,7 @@ lucas Ludovic Claude Magesh Umasankar Maneesh Sahu +Marcel Schutte Marcus Börger Mariusz Nowostawski Martijn Kruithof @@ -161,8 +162,7 @@ Scott Carlson Sean Egan Sean P. Kane Shiraz Kanga -skanthak -slo +Sebastian Kantha Stefan Bodewig Stefano Mazzocchi Stephane Bailliez diff --git a/WHATSNEW b/WHATSNEW index 1b89be733..3a962376f 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -90,6 +90,8 @@ Fixed bugs: * -projecthelp swallowed (configuration) errors silently. Bugzilla report 27732. +* filterset used by filtertask doesn't respect loglevel. Bugzilla Report 27568. + Other changes: -------------- diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java index 4906bc352..ba7449647 100644 --- a/src/main/org/apache/tools/ant/Project.java +++ b/src/main/org/apache/tools/ant/Project.java @@ -137,6 +137,11 @@ public class Project { private Hashtable targets = new Hashtable(); /** Set of global filters. */ private FilterSet globalFilterSet = new FilterSet(); + { + // Initialize the globalFileSet's project + globalFilterSet.setProject(this); + } + /** * Wrapper around globalFilterSet. This collection only ever * contains one FilterSet, but the wrapper is needed in order to