Author: nextgens
Date: 2008-07-19 17:51:21 +0000 (Sat, 19 Jul 2008)
New Revision: 21260
Modified:
trunk/freenet/src/freenet/clients/http/StartupToadlet.java
trunk/freenet/src/freenet/config/FilePersistentConfig.java
trunk/freenet/src/freenet/config/FreenetFilePersistentConfig.java
Log:
paranoia
Modified: trunk/freenet/src/freenet/clients/http/StartupToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StartupToadlet.java 2008-07-19
17:39:24 UTC (rev 21259)
+++ trunk/freenet/src/freenet/clients/http/StartupToadlet.java 2008-07-19
17:51:21 UTC (rev 21260)
@@ -59,4 +59,4 @@
public void setIsPRNGReady() {
isPRNGReady = true;
}
-}
\ No newline at end of file
+}
Modified: trunk/freenet/src/freenet/config/FilePersistentConfig.java
===================================================================
--- trunk/freenet/src/freenet/config/FilePersistentConfig.java 2008-07-19
17:39:24 UTC (rev 21259)
+++ trunk/freenet/src/freenet/config/FilePersistentConfig.java 2008-07-19
17:51:21 UTC (rev 21260)
@@ -128,7 +128,10 @@
}
/** Don't call without taking storeSync first */
- protected void innerStore() throws IOException {
+ protected final void innerStore() throws IOException {
+ if(!finishedInit)
+ throw new IllegalStateException("SHOULD NOT HAPPEN!!");
+
SimpleFieldSet fs = exportFieldSet();
if(Logger.shouldLog(Logger.MINOR, this))
Logger.minor(this, "fs = " + fs);
Modified: trunk/freenet/src/freenet/config/FreenetFilePersistentConfig.java
===================================================================
--- trunk/freenet/src/freenet/config/FreenetFilePersistentConfig.java
2008-07-19 17:39:24 UTC (rev 21259)
+++ trunk/freenet/src/freenet/config/FreenetFilePersistentConfig.java
2008-07-19 17:51:21 UTC (rev 21260)
@@ -8,8 +8,8 @@
import freenet.support.SimpleFieldSet;
public class FreenetFilePersistentConfig extends FilePersistentConfig {
- private boolean isWritingConfig = false;
- private boolean hasNodeStarted = false;
+ private volatile boolean isWritingConfig = false;
+ private volatile boolean hasNodeStarted = false;
private Ticker ticker;
public final Runnable thread = new Runnable() {
public void run() {
