bug 67461
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationActivator.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationActivator.java
index 3f03d98..c542248 100644
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationActivator.java
+++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationActivator.java
@@ -427,7 +427,6 @@
private boolean canRunWithCachedData() {
return !"true".equals(System.getProperty("osgi.checkConfiguration")) && //$NON-NLS-1$ //$NON-NLS-2$
- System.getProperties().get("osgi.dev") == null && //$NON-NLS-1$
lastTimeStamp==configuration.getChangeStamp() &&
lastStateTimeStamp==Platform.getPlatformAdmin().getState(false).getTimeStamp();
}
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/SiteEntry.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/SiteEntry.java
index 7a08905..a5e5215 100644
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/SiteEntry.java
+++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/SiteEntry.java
@@ -470,9 +470,7 @@
Utils.log(Messages.getString("SiteEntry.computePluginStamp", resolvedURL.toExternalForm())); //$NON-NLS-1$
return 0;
}
- long start = 0;
- if (ConfigurationActivator.DEBUG)
- start = (new Date()).getTime();
+
// compute stamp for the plugins directory
File root = new File(resolvedURL.getFile().replace('/', File.separatorChar));
File pluginsDir = new File(root, PLUGINS);
@@ -481,36 +479,7 @@
return 0;
}
- // Compute the plugins list
- String[] plugins = null;
- ISitePolicy policy = getSitePolicy();
- if (policy.getType() == ISitePolicy.USER_INCLUDE)
- plugins = policy.getList();
- else if (policy.getType() == ISitePolicy.USER_EXCLUDE) {
- File[] files = pluginsDir.listFiles();
- ArrayList detectedPlugins = new ArrayList(files.length);
- for (int i = 0; i < files.length; i++) {
- if(files[i].isDirectory())
- detectedPlugins.add(PLUGINS + "/" + files[i].getName() + "/"); //$NON-NLS-1$ //$NON-NLS-2$
- else if(files[i].getName().endsWith(".jar")) //$NON-NLS-1$
- detectedPlugins.add(PLUGINS + "/" + files[i].getName()); //$NON-NLS-1$
- }
-
- String[] excludedPlugins = policy.getList();
- for (int i = 0; i < excludedPlugins.length; i++) {
- if (detectedPlugins.contains(excludedPlugins[i]))
- detectedPlugins.remove(excludedPlugins[i]);
- }
- plugins = (String[])detectedPlugins.toArray(new String[0]);
- }
-
-
- long dirStamp = pluginsDir.lastModified();
- pluginsChangeStamp = Math.max(dirStamp, computeStamp(plugins));
- if (ConfigurationActivator.DEBUG) {
- long end = (new Date()).getTime();
- Utils.debug(resolvedURL.toString() + " plugin stamp: " + pluginsChangeStamp + " in " + (end - start) + "ms"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- }
+ pluginsChangeStamp = pluginsDir.lastModified();
return pluginsChangeStamp;
}
