[FIXED JENKINS-20940] Use rootProject as copying sources. This allows…

… correct project name resolving from matrix projects.
jenkinsci · Jun 17, 2014 · 06fa458 · 06fa458
1 parent db1e878
commit 06fa458
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/main/java/hudson/plugins/copyartifact/CopyArtifact.java b/src/main/java/hudson/plugins/copyartifact/CopyArtifact.java
@@ -103,13 +103,15 @@ public CopyArtifact(String projectName, String parameters, BuildSelector selecto
         // check the permissions only if we can
         StaplerRequest req = Stapler.getCurrentRequest();
         if (req!=null) {
-            ItemGroup context = req.findAncestorObject(ItemGroup.class);
-            if (context == null) context = Jenkins.getInstance();
-
-            // Prevents both invalid values and access to artifacts of projects which this user cannot see.
-            // If value is parameterized, it will be checked when build runs.
-            if (projectName.indexOf('$') < 0 && Jenkins.getInstance().getItem(projectName, context, Job.class) == null)
-                projectName = ""; // Ignore/clear bad value to avoid ugly 500 page
+            AbstractProject<?,?> p = req.findAncestorObject(AbstractProject.class);
+            if (p != null) {
+                ItemGroup<?> context = p.getParent();
+
+                // Prevents both invalid values and access to artifacts of projects which this user cannot see.
+                // If value is parameterized, it will be checked when build runs.
+                if (projectName.indexOf('$') < 0 && Jenkins.getInstance().getItem(projectName, context, Job.class) == null)
+                    projectName = ""; // Ignore/clear bad value to avoid ugly 500 page
+            }
         }
 
         this.project = projectName;
@@ -251,7 +253,7 @@ public boolean perform(AbstractBuild<?,?> build, Launcher launcher, BuildListene
             EnvVars env = build.getEnvironment(listener);
             env.overrideAll(build.getBuildVariables()); // Add in matrix axes..
             expandedProject = env.expand(project);
-            Job<?, ?> job = Jenkins.getInstance().getItem(expandedProject, build.getProject().getParent(), Job.class);
+            Job<?, ?> job = Jenkins.getInstance().getItem(expandedProject, build.getProject().getRootProject().getParent(), Job.class);
             if (job != null && !expandedProject.equals(project)
                 // If projectName is parameterized, need to do permission check on source project.
                 && !canReadFrom(job, build)) {