Skip to content
Permalink
Browse files

Merge remote-tracking branch 'upstream/master' [JENKINS-29545]

  • Loading branch information
v1v committed Jul 21, 2015
2 parents 99a4b1c + 89ea91d commit a69e3fc4bd7fe284ebe1e01779ec9c491e6586b1
Showing with 2 additions and 3 deletions.
  1. +1 −1 pom.xml
  2. +1 −2 src/main/java/org/jenkins/ci/plugins/jenkinslint/check/CleanupWorkspaceChecker.java
@@ -93,7 +93,7 @@
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ws-cleanup</artifactId>
<version>0.26</version>
<optional>true</optional>
<scope>test</scope>
</dependency>

<dependency>
@@ -21,9 +21,8 @@ public CleanupWorkspaceChecker() {

public boolean executeCheck(Item item) {
if (Jenkins.getInstance().pluginManager.getPlugin("ws-cleanup")!=null) {
return item instanceof Project && ((Project) item).getPublisher(Descriptor.find(hudson.plugins.ws_cleanup.WsCleanup.DescriptorImpl.class.getName())) == null;
return item instanceof Project && ((Project) item).getPublisher(Descriptor.find("hudson.plugins.ws_cleanup.WsCleanup")) == null;
} else {
// If ws-cleanup hasn't been installed yet
return true;
}
}

0 comments on commit a69e3fc

Please sign in to comment.
You can’t perform that action at this time.