diff options
Diffstat (limited to 'src/com/gitblit/FileSettings.java')
| -rw-r--r-- | src/com/gitblit/FileSettings.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/com/gitblit/FileSettings.java b/src/com/gitblit/FileSettings.java index 8ac99f6d..666bda05 100644 --- a/src/com/gitblit/FileSettings.java +++ b/src/com/gitblit/FileSettings.java @@ -37,6 +37,8 @@ public class FileSettings extends IStoredSettings { private final Properties properties = new Properties();
private volatile long lastModified;
+
+ private volatile boolean forceReload;
public FileSettings(String file) {
super(FileSettings.class);
@@ -49,7 +51,7 @@ public class FileSettings extends IStoredSettings { */
@Override
protected synchronized Properties read() {
- if (propertiesFile.exists() && (propertiesFile.lastModified() > lastModified)) {
+ if (propertiesFile.exists() && (forceReload || (propertiesFile.lastModified() > lastModified))) {
FileInputStream is = null;
try {
Properties props = new Properties();
@@ -60,6 +62,7 @@ public class FileSettings extends IStoredSettings { properties.clear();
properties.putAll(props);
lastModified = propertiesFile.lastModified();
+ forceReload = false;
} catch (FileNotFoundException f) {
// IGNORE - won't happen because file.exists() check above
} catch (Throwable t) {
@@ -88,6 +91,9 @@ public class FileSettings extends IStoredSettings { content = content.replaceAll(regex, setting.getKey() + " = " + setting.getValue());
}
FileUtils.writeContent(propertiesFile, content);
+ // manually set the forceReload flag because not all JVMs support real
+ // millisecond resolution of lastModified. (issue-55)
+ forceReload = true;
return true;
}
@@ -102,6 +108,13 @@ public class FileSettings extends IStoredSettings { return lastModified;
}
+ /**
+ * @return the state of the force reload flag
+ */
+ protected boolean forceReload() {
+ return forceReload;
+ }
+
@Override
public String toString() {
return propertiesFile.getAbsolutePath();
|