Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[FIXED JENKINS-28469] Resolved blind cast issue from ItemGroup to
AbstractProject
  • Loading branch information
cletusdsouza committed Aug 11, 2015
1 parent 9bcfbb1 commit 9c42a1f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 39 deletions.
21 changes: 1 addition & 20 deletions src/main/java/hudson/scm/IntegrityDeleteNonMembersAction.java
Expand Up @@ -5,7 +5,6 @@
import hudson.model.BuildListener;
import hudson.model.AbstractBuild;
import hudson.model.AbstractProject;
import hudson.model.Hudson;
import hudson.tasks.BuildStepDescriptor;
import hudson.tasks.BuildStepMonitor;
import hudson.tasks.Notifier;
Expand All @@ -25,30 +24,12 @@ public class IntegrityDeleteNonMembersAction extends Notifier implements Seriali
@Extension
public static final IntegrityDeleteNonMembersDescriptorImpl DELETENONMEMBERS_DESCRIPTOR = new IntegrityDeleteNonMembersDescriptorImpl();


/**
* Obtains the root project for the build
* @param abstractProject
* @return
*/
private AbstractProject<?,?> getRootProject(AbstractProject<?,?> abstractProject)
{
if (abstractProject.getParent() instanceof Hudson)
{
return abstractProject;
}
else
{
return getRootProject((AbstractProject<?,?>) abstractProject.getParent());
}
}

/**
* Executes the actual Integrity Delete Non Members operation
*/
public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException
{
AbstractProject<?, ?> rootProject = getRootProject(build.getProject());
AbstractProject<?, ?> rootProject = build.getProject().getRootProject();

if (!(rootProject.getScm() instanceof IntegritySCM))
{
Expand Down
20 changes: 1 addition & 19 deletions src/main/java/hudson/scm/IntegrityDeleteNonMembersTask.java
Expand Up @@ -14,7 +14,6 @@
import hudson.model.AbstractBuild;
import hudson.model.AbstractProject;
import hudson.model.BuildListener;
import hudson.model.Hudson;
import hudson.remoting.VirtualChannel;

public class IntegrityDeleteNonMembersTask implements FileCallable<Boolean>
Expand All @@ -36,7 +35,7 @@ public IntegrityDeleteNonMembersTask( AbstractBuild<?, ?> build,BuildListener li

public Boolean invoke(File f, VirtualChannel channel) throws IOException, InterruptedException
{
AbstractProject<?, ?> rootProject = getRootProject(build.getProject());
AbstractProject<?, ?> rootProject = build.getProject().getRootProject();

if (!(rootProject.getScm() instanceof IntegritySCM))
{
Expand All @@ -58,23 +57,6 @@ public Boolean invoke(File f, VirtualChannel channel) throws IOException, Interr
return true;
}

/**
* Obtains the root project for the build
* @param abstractProject
* @return
*/
private AbstractProject<?, ?> getRootProject(AbstractProject<?, ?> abstractProject)
{
if (abstractProject.getParent() instanceof Hudson)
{
return abstractProject;
}
else
{
return getRootProject((AbstractProject<?, ?>) abstractProject.getParent());
}
}

/**
* Delete all members in the build workspace that are not under version control
* @param build
Expand Down

0 comments on commit 9c42a1f

Please sign in to comment.