190831 Update Configurator reconciles platform.xml with newer features even when the site is marked not updateable.
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 52ceefd..b4455ed 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
@@ -541,8 +541,10 @@
// on next access
ISiteEntry[] sites = getConfiguredSites();
for (int i = 0; i < sites.length; i++) {
- // reset site entry
- ((SiteEntry) sites[i]).refresh();
+ if (sites[i].isUpdateable()) {
+ // reset site entry
+ ((SiteEntry) sites[i]).refresh();
+ }
}
}
@@ -1227,10 +1229,12 @@
private void reconcile() throws CoreException {
long lastChange = config.getDate().getTime();
SiteEntry[] sites = config.getSites();
- for (int s=0; s<sites.length; s++) {
- long siteTimestamp = sites[s].getChangeStamp();
- if (siteTimestamp > lastChange)
- sites[s].loadFromDisk(lastChange);
+ for (int s = 0; s < sites.length; s++) {
+ if (sites[s].isUpdateable()) {
+ long siteTimestamp = sites[s].getChangeStamp();
+ if (siteTimestamp > lastChange)
+ sites[s].loadFromDisk(lastChange);
+ }
}
config.setDirty(true);
}
