From 0864db0364aaf07509762d04f56ef6f8a8d478a3 Mon Sep 17 00:00:00 2001
From: Maarten Coene <4728619+maartenc@users.noreply.github.com>
Date: Tue, 23 Nov 2021 17:47:28 +0100
Subject: [PATCH] set the project a bit sooner so it can be used within the
 other methods

---
 src/java/org/apache/ivy/ant/IvyRetrieve.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/java/org/apache/ivy/ant/IvyRetrieve.java b/src/java/org/apache/ivy/ant/IvyRetrieve.java
index 2e0d6c9c..963585b4 100644
--- a/src/java/org/apache/ivy/ant/IvyRetrieve.java
+++ b/src/java/org/apache/ivy/ant/IvyRetrieve.java
@@ -131,8 +131,10 @@ public class IvyRetrieve extends IvyPostResolveTask {
                 Collection<File> retrievedFiles = report.getRetrievedFiles();
                 if (retrievedFiles.isEmpty()) {
                     fileset = new EmptyFileSet();
+                    fileset.setProject(getProject());
                 } else {
                     fileset = new FileSet();
+                    fileset.setProject(getProject());
                     fileset.setDir(report.getRetrieveRoot());
 
                     for (File file : retrievedFiles) {
@@ -141,7 +143,6 @@ public class IvyRetrieve extends IvyPostResolveTask {
                     }
                 }
 
-                fileset.setProject(getProject());
                 getProject().addReference(getSetId(), fileset);
             }
         } catch (Exception ex) {