Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 76761 invoked from network); 27 Nov 2003 10:29:39 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 27 Nov 2003 10:29:39 -0000 Received: (qmail 25075 invoked by uid 500); 27 Nov 2003 10:29:11 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 24929 invoked by uid 500); 27 Nov 2003 10:29:10 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 24916 invoked by uid 500); 27 Nov 2003 10:29:10 -0000 Received: (qmail 24909 invoked from network); 27 Nov 2003 10:29:09 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 27 Nov 2003 10:29:09 -0000 Received: (qmail 76714 invoked by uid 1539); 27 Nov 2003 10:29:35 -0000 Date: 27 Nov 2003 10:29:35 -0000 Message-ID: <20031127102935.76713.qmail@minotaur.apache.org> From: peterreilly@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/util ScriptRunner.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N peterreilly 2003/11/27 02:29:35 Modified: src/main/org/apache/tools/ant/util Tag: ANT_16_BRANCH ScriptRunner.java Log: Sync with head Revision Changes Path No revision No revision 1.1.2.2 +9 -1 ant/src/main/org/apache/tools/ant/util/ScriptRunner.java Index: ScriptRunner.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/ScriptRunner.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- ScriptRunner.java 22 Oct 2003 09:28:22 -0000 1.1.2.1 +++ ScriptRunner.java 27 Nov 2003 10:29:35 -0000 1.1.2.2 @@ -139,7 +139,15 @@ for (Iterator i = beans.keySet().iterator(); i.hasNext();) { String key = (String) i.next(); Object value = beans.get(key); - manager.declareBean(key, value, value.getClass()); + if (value != null) { + manager.declareBean(key, value, value.getClass()); + } else { + // BSF uses a hashtable to store values + // so cannot declareBean with a null value + // So need to remove any bean of this name as + // that bean should not be visible + manager.undeclareBean(key); + } } // execute the script --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org