### Eclipse Workspace Patch 1.0 #P org.eclipse.update.core Index: src/org/eclipse/update/internal/core/InstallConfiguration.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java,v retrieving revision 1.167 diff -u -r1.167 InstallConfiguration.java --- src/org/eclipse/update/internal/core/InstallConfiguration.java 23 Aug 2006 15:31:11 -0000 1.167 +++ src/org/eclipse/update/internal/core/InstallConfiguration.java 1 Jun 2007 21:16:06 -0000 @@ -497,6 +497,23 @@ if (featurePlugin != null) pluginVersion = featurePlugin.getVersionedIdentifier().getVersion().toString(); + // Find the site + SiteEntry siteEntry = null; + try { + URL featureUrl = new URL(cSite.getPlatformURLString()); + siteEntry = (SiteEntry)runtimeConfiguration.findConfiguredSite(featureUrl); + } catch (MalformedURLException e) { + UpdateCore.warn(NLS.bind(Messages.InstallConfiguration_UnableToCreateURL, (new String[] { cSite.getPlatformURLString() })), e); + } catch (ClassCastException e) { + UpdateCore.warn(Messages.InstallConfiguration_UnableToCast, e); + } + + // if the URL doesn't exist log it + if (siteEntry == null) { + UpdateCore.warn(NLS.bind(Messages.InstallConfiguration_unableToFindSite, (new String[] { cSite.getSite().getURL().toExternalForm(), runtimeConfiguration.getConfigurationLocation().toExternalForm() }))); + return; + } + // write the primary features if (feature.isPrimary()) { // get any fragments for the feature plugin @@ -515,7 +532,6 @@ String application = feature.getApplication(); FeatureEntry featureEntry = (FeatureEntry)runtimeConfiguration.createFeatureEntry(id, version, pluginIdentifier, pluginVersion, true, application, roots); featureEntry.setURL(getFeatureRelativeURL(feature)); - SiteEntry siteEntry = (SiteEntry)runtimeConfiguration.findConfiguredSite(cSite.getSite().getURL()); siteEntry.addFeatureEntry(featureEntry); } else { // write non-primary feature entries @@ -523,7 +539,6 @@ String pluginIdentifier = feature.getPrimaryPluginID(); FeatureEntry featureEntry = (FeatureEntry)runtimeConfiguration.createFeatureEntry(id, version, pluginIdentifier, pluginVersion, false, null, null); featureEntry.setURL(getFeatureRelativeURL(feature)); - SiteEntry siteEntry = (SiteEntry)runtimeConfiguration.findConfiguredSite(cSite.getSite().getURL()); siteEntry.addFeatureEntry(featureEntry); }