From e5c7b2601c1e29155e109505fde8368ec6cc0143 Mon Sep 17 00:00:00 2001 From: Tina Chen Date: Thu, 6 Sep 2018 11:14:43 -0700 Subject: [PATCH 1/2] Invalid fix in branch for testing --- .../update/internal/configurator/PlatformConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java index 610d4f8958..3f245ecef8 100644 --- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java +++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java @@ -993,7 +993,7 @@ private void saveAsXML(OutputStream stream) throws CoreException, IOException { private void reconcile() throws CoreException { long lastChange = config.getDate().getTime(); SiteEntry[] sites = config.getSites(); - for (int s = 0; s < sites.length; s++) { + for (int s = 0; s < sites.length - 1; s++) { //invalid fix in branch randomFix if (sites[s].isUpdateable()) { long siteTimestamp = sites[s].getChangeStamp(); if (siteTimestamp > lastChange) From e81197468f33d8f4303b3a7fa1bbfd41d4fe0157 Mon Sep 17 00:00:00 2001 From: Tina Chen Date: Mon, 10 Sep 2018 15:11:02 -0700 Subject: [PATCH 2/2] Invalid code deletion in branch for testing --- .../configurator/PlatformConfiguration.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java index 3f245ecef8..225cf42169 100644 --- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java +++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java @@ -918,23 +918,7 @@ else if (protocol.equals("platform")) { //$NON-NLS-1$ } public static URL resolvePlatformURL(URL url, URL base_path_Location) throws IOException { - if (url.getProtocol().equals("platform")) { //$NON-NLS-1$ - if (base_path_Location == null) { - url = FileLocator.toFileURL(url); - File f = new File(url.getFile()); - url = f.toURL(); - } else { - final String BASE = "platform:/base/"; - final String CONFIG = "platform:/config/"; - String toResolve = url.toExternalForm(); - if (toResolve.startsWith(BASE)) - url = new URL(base_path_Location, toResolve.substring(BASE.length())); - else if (toResolve.startsWith(CONFIG)) { - url = new URL(base_path_Location, toResolve.substring(CONFIG.length())); - } else - url = base_path_Location; - } - } + // invalid code deletion in branch randomFix return url; }