[FIXED JENKINS-34883] the legacy default update site can be different…

… from the one specified by ID_DEFAULT
jenkinsci · May 19, 2016 · 1e746f6 · 1e746f6
1 parent d08eec1
commit 1e746f6
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java
@@ -160,6 +160,8 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
      */
     public static final String ID_DEFAULT = SystemProperties.getString(UpdateCenter.class.getName()+".defaultUpdateSiteId", "default");
 
+    public static final String LEGACY_ID_DEFAULT = "default";
+
     @Restricted(NoExternalUse.class)
     public static final String ID_UPLOAD = "_upload";
 
@@ -845,7 +847,7 @@ public synchronized void save() {
      * Loads the data from the disk into this object.
      */
     public synchronized void load() throws IOException {
-        UpdateSite defaultSite = new UpdateSite(ID_DEFAULT, config.getUpdateCenterUrl() + "update-center.json");
+        UpdateSite defaultSite = new UpdateSite(LEGACY_ID_DEFAULT, config.getUpdateCenterUrl() + "update-center.json");
         XmlFile file = getConfigFile();
         if(file.exists()) {
             try {