OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-04 07:35:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'primary/master' into

Browse Source 
JENKINS-34174-plugin-download-timeout

# Conflicts:
#	core/src/main/resources/jenkins/install/pluginSetupWizard.properties
This commit is contained in:
kzantow committed 2016-04-22 10:37:18 -04:00
2 parents 6974d2b759 5d90f81656
commit e612f4163a
6 files changed
+18 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/PluginManager.java
+6 -4
View File
@@ -1009,6 +1009,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
pluginInfo.put("bundled", plugin.isBundled);
pluginInfo.put("deleted", plugin.isDeleted());
pluginInfo.put("downgradable", plugin.isDowngradable());
pluginInfo.put("website", plugin.getUrl());
List<Dependency> dependencies = plugin.getDependencies();
if (dependencies != null && !dependencies.isEmpty()) {
Map<String, String> dependencyMap = new HashMap<>();
@@ -1033,6 +1034,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
pluginInfo.put("excerpt", plugin.excerpt);
pluginInfo.put("site", site.getId());
pluginInfo.put("dependencies", plugin.dependencies);
pluginInfo.put("website", plugin.wiki);
response.add(pluginInfo);
}
}
@@ -1198,19 +1200,19 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
new Thread() {
@Override
public void run() {
final boolean failures[] = { false };
boolean failures = false;
INSTALLING: while (true) {
try {
updateCenter.persistInstallStatus();
Thread.sleep(500);
failures[0] = false;
failures = false;
for (Future<UpdateCenter.UpdateCenterJob> jobFuture : installJobs) {
if(!jobFuture.isDone() && !jobFuture.isCancelled()) {
continue INSTALLING;
}
UpdateCenter.UpdateCenterJob job = jobFuture.get();
if(job instanceof InstallationJob && ((InstallationJob)job).status instanceof DownloadJob.Failure) {
failures[0] = true;
failures = true;
}
}
} catch (Exception e) {
@@ -1219,7 +1221,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
break;
}
updateCenter.persistInstallStatus();
if(!failures[0]) {
if(!failures) {
jenkins.setInstallState(InstallState.INITIAL_PLUGINS_INSTALLING.getNextState());
}
}