mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-10-29 20:45:20 +00:00
Corrected backward incompatible signature changes in 70c1065814.
This commit is contained in:
1 parent
e669d8cc85
commit
5dddebcf94
12 files changed
+112
-51
No files matched your search
@@ -42,10 +42,10 @@ import java.util.logging.Logger;
|
||||
* @author Kohsuke Kawaguchi
|
||||
*/
|
||||
public class LocalPluginManager extends PluginManager {
|
||||
private final Jenkins hudson;
|
||||
public LocalPluginManager(Jenkins hudson) {
|
||||
super(hudson.servletContext, new File(hudson.getRootDir(),"plugins"));
|
||||
this.hudson = hudson;
|
||||
private final Jenkins jenkins;
|
||||
public LocalPluginManager(Jenkins jenkins) {
|
||||
super(jenkins.servletContext, new File(jenkins.getRootDir(),"plugins"));
|
||||
this.jenkins = jenkins;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -63,7 +63,7 @@ public class LocalPluginManager extends PluginManager {
|
||||
|
||||
Set<String> names = new HashSet<String>();
|
||||
|
||||
for( String path : Util.fixNull((Set<String>)hudson.servletContext.getResourcePaths("/WEB-INF/plugins"))) {
|
||||
for( String path : Util.fixNull((Set<String>) jenkins.servletContext.getResourcePaths("/WEB-INF/plugins"))) {
|
||||
String fileName = path.substring(path.lastIndexOf('/')+1);
|
||||
if(fileName.length()==0) {
|
||||
// see http://www.nabble.com/404-Not-Found-error-when-clicking-on-help-td24508544.html
|
||||
@@ -73,7 +73,7 @@ public class LocalPluginManager extends PluginManager {
|
||||
try {
|
||||
names.add(fileName);
|
||||
|
||||
URL url = hudson.servletContext.getResource(path);
|
||||
URL url = jenkins.servletContext.getResource(path);
|
||||
copyBundledPlugin(url, fileName);
|
||||
} catch (IOException e) {
|
||||
LOGGER.log(Level.SEVERE, "Failed to extract the bundled plugin "+fileName,e);
|
||||
|
||||
Reference in new issue
Block a user