bug 50734
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 dc7871e..cce6e4d 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
@@ -27,7 +27,7 @@
public static String PI_CONFIGURATOR = "org.eclipse.update.configurator";
public static final String INSTALL_LOCATION = "osgi.installLocation";
-
+ public static final String LAST_CONFIG_STAMP = "last.config.stamp";
// debug options
public static String OPTION_DEBUG = PI_CONFIGURATOR + "/debug";
// debug values
@@ -96,7 +96,7 @@
throw Utils.newCoreException("Cannot create configuration in " + configArea, null);
try {
- DataInputStream stream = new DataInputStream(new FileInputStream(configArea + "/last.config.stamp"));
+ DataInputStream stream = new DataInputStream(new FileInputStream(configArea + File.separator + LAST_CONFIG_STAMP));
lastTimeStamp = stream.readLong();
} catch (FileNotFoundException e) {
lastTimeStamp = configuration.getChangeStamp() - 1;
@@ -135,7 +135,7 @@
private void writePlatformConfigurationTimeStamp() {
try {
- DataOutputStream stream = new DataOutputStream(new FileOutputStream(configArea + "/last.config.stamp"));
+ DataOutputStream stream = new DataOutputStream(new FileOutputStream(configArea + File.separator + LAST_CONFIG_STAMP));
stream.writeLong(configuration.getChangeStamp());
} catch (FileNotFoundException e) {
Utils.log(e.getLocalizedMessage());
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 2af6a70..678893b 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
@@ -998,7 +998,7 @@
return; // need to be able to do "dir"
copy(new File(source.getFile()), new File(target));
-
+
} catch (IOException e) {
// this is an optimistic copy. If we fail, the state will be reconciled
// when the update manager is triggered.
@@ -1009,7 +1009,12 @@
if (src.isDirectory()) {
// copy content of directories
tgt.mkdir();
- File[] list = src.listFiles();
+ FilenameFilter filter = new FilenameFilter() {
+ public boolean accept(File dir, String name) {
+ return !name.equals(ConfigurationActivator.LAST_CONFIG_STAMP);
+ }
+ };
+ File[] list = src.listFiles(filter);
if (list == null)
return;
for (int i = 0; i < list.length; i++) {
