Return-Path: 
 <ant-dev-return-37837-qmlist-jakarta-archive-ant-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-ant-dev-archive@apache.org
Received: (qmail 36605 invoked from network); 13 Sep 2002 08:54:36 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 13 Sep 2002 08:54:36 -0000
Received: (qmail 2750 invoked by uid 97); 13 Sep 2002 08:55:20 -0000
Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org
Received: (qmail 2726 invoked by uid 97); 13 Sep 2002 08:55:19 -0000
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:ant-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:ant-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:ant-dev-help@jakarta.apache.org>
List-Post: <mailto:ant-dev@jakarta.apache.org>
List-Id: "Ant Developers List" <ant-dev.jakarta.apache.org>
Reply-To: "Ant Developers List" <ant-dev@jakarta.apache.org>
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 2697 invoked by uid 97); 13 Sep 2002 08:55:18 -0000
X-Antivirus: nagoya (v4218 created Aug 14 2002)
Date: 13 Sep 2002 08:54:27 -0000
Message-ID: <20020913085427.46124.qmail@icarus.apache.org>
From: bodewig@apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs
 Ant.java Property.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

bodewig     2002/09/13 01:54:27

  Modified:    src/main/org/apache/tools/ant/taskdefs Ant.java
                        Property.java
  Log:
  Release references to the child project when <ant*> has been done.
  
  PR: 12499
  Submitted by:	<gregm at bea.com>
  
  Revision  Changes    Path
  1.66      +6 -0      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
  
  Index: Ant.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- Ant.java	25 Jul 2002 15:21:04 -0000	1.65
  +++ Ant.java	13 Sep 2002 08:54:26 -0000	1.66
  @@ -377,6 +377,12 @@
           } finally {
               // help the gc
               newProject = null;
  +            Enumeration enum = properties.elements();
  +            while (enum.hasMoreElements()) {
  +                Property p = (Property) enum.nextElement();
  +                p.setProject(null);
  +            }
  +
               if (output != null && out != null) {
                   try {
                       out.close();
  
  
  
  1.56      +4 -0      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Property.java
  
  Index: Property.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Property.java,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- Property.java	31 Jul 2002 07:04:48 -0000	1.55
  +++ Property.java	13 Sep 2002 08:54:26 -0000	1.56
  @@ -320,6 +320,10 @@
        * here is where it is loaded
        */
       public void execute() throws BuildException {
  +        if (getProject() == null) {
  +            throw new IllegalStateException("project has not been set");
  +        }
  +
           if (name != null) {
               if (value == null && ref == null) {
                   throw new BuildException("You must specify value, location or "
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>