From 961ac2f458100fcccc3ec93e4c553491c8babed9 Mon Sep 17 00:00:00 2001 From: Peter Reilly Date: Mon, 17 Jan 2005 09:34:05 +0000 Subject: [PATCH] Allow scriptfilter and scriptselector to be used with groovy's restricted script names. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277370 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/types/optional/ScriptFilter.java | 2 +- .../org/apache/tools/ant/types/optional/ScriptSelector.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java b/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java index 041d3af5c..5bcfad644 100644 --- a/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java +++ b/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java @@ -92,7 +92,7 @@ public class ScriptFilter extends TokenFilter.ChainableReaderFilter { public String filter(String token) { init(); setToken(token); - runner.executeScript(""); + runner.executeScript("ant_filter"); return getToken(); } diff --git a/src/main/org/apache/tools/ant/types/optional/ScriptSelector.java b/src/main/org/apache/tools/ant/types/optional/ScriptSelector.java index c0f879774..e7ee94fe0 100644 --- a/src/main/org/apache/tools/ant/types/optional/ScriptSelector.java +++ b/src/main/org/apache/tools/ant/types/optional/ScriptSelector.java @@ -112,7 +112,7 @@ public class ScriptSelector extends BaseSelector { runner.addBean("basedir", basedir); runner.addBean("filename", filename); runner.addBean("file", file); - runner.executeScript(""); + runner.executeScript("ant_selector"); return isSelected(); }