aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault (Ericsson)2013-01-24 13:44:21 (EST)
committerPascal Rapicault2013-01-24 13:56:31 (EST)
commit75a1b906e6e91e076907ebd1dc30d96704f31ce3 (patch)
treee7f6a9bc0a52e75e16010cd967cdba74dec14d3d
parente431a9ec4fab992b9250189c4cf756817a3f0196 (diff)
downloadrt.equinox.framework-75a1b906e6e91e076907ebd1dc30d96704f31ce3.zip
rt.equinox.framework-75a1b906e6e91e076907ebd1dc30d96704f31ce3.tar.gz
rt.equinox.framework-75a1b906e6e91e076907ebd1dc30d96704f31ce3.tar.bz2
-rw-r--r--bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
index 5b5e024..85417f6 100644
--- a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
+++ b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
@@ -1786,7 +1786,7 @@ public class Main {
// Now we know where the base configuration is supposed to be. Go ahead and load
// it and merge into the System properties. Then, if cascaded, read the parent configuration.
// Note that in a cascaded situation, the user configuration may be ignored if the parent
- // configuration has changed since the execution.
+ // configuration has changed since the user configuration has been written.
// Note that the parent may or may not be the same parent as we read above since the
// base can define its parent. The first parent we read was either defined by the user
// on the command line or was the one in the install dir.
@@ -1874,7 +1874,7 @@ public class Main {
return connection.getLastModified();
}
- //Get the timestamp that has been remembered
+ //Get the timestamp that has been remembered. The BASE_TIMESTAMP_FILE_CONFIGINI is written at provisioning time by fwkAdmin.
private long getLastKnownConfigIniBaseTimestamp() {
if (debug)
System.out.println("Loading timestamp file from:\n\t " + getConfigurationLocation() + " " + BASE_TIMESTAMP_FILE_CONFIGINI); //$NON-NLS-1$ //$NON-NLS-2$