From c1bf9805b5138b82d3a6743b4fbb2071bcffe1d1 Mon Sep 17 00:00:00 2001 From: Matthew Jason Benson Date: Wed, 10 Jan 2007 19:48:57 +0000 Subject: [PATCH] when child resource collection added with null Project, it inherits ours git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@494953 13f79535-47bb-0310-9956-ffa450edef68 --- .../types/resources/BaseResourceCollectionContainer.java | 6 ++++++ .../ant/types/resources/BaseResourceCollectionWrapper.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java b/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java index 2a7685e45..68e2e7f91 100644 --- a/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java +++ b/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java @@ -82,6 +82,12 @@ public abstract class BaseResourceCollectionContainer if (c == null) { return; } + if (Project.getProject(c) == null) { + Project p = getProject(); + if (p != null) { + p.setProjectReference(c); + } + } rc.add(c); FailFast.invalidate(this); coll = null; diff --git a/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.java b/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.java index d18c19669..2cf14ccf3 100644 --- a/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.java +++ b/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.java @@ -73,6 +73,12 @@ public abstract class BaseResourceCollectionWrapper throw oneNested(); } rc = c; + if (Project.getProject(rc) == null) { + Project p = getProject(); + if (p != null) { + p.setProjectReference(rc); + } + } setChecked(false); }