Author: j16sdiz
Date: 2008-08-15 08:18:12 +0000 (Fri, 15 Aug 2008)
New Revision: 21885

Modified:
   branches/saltedhashstore/freenet/src/freenet/l10n/freenet.l10n.en.properties
   branches/saltedhashstore/freenet/src/freenet/node/Node.java
Log:
Revert r21704 "Allow changing datastore type from ConfigToadlet"

Modified: 
branches/saltedhashstore/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- 
branches/saltedhashstore/freenet/src/freenet/l10n/freenet.l10n.en.properties    
    2008-08-15 07:49:52 UTC (rev 21884)
+++ 
branches/saltedhashstore/freenet/src/freenet/l10n/freenet.l10n.en.properties    
    2008-08-15 08:18:12 UTC (rev 21885)
@@ -705,7 +705,7 @@
 Node.storeSize=Store size in bytes
 Node.storeSizeLong=Store size in bytes
 Node.storeType=Store type (LEAVE THIS ALONE)
-Node.storeTypeLong=Datastore type. Currently this can be salt-hash (use a 
salted on-disk hashtable with bloom filter), bdb-index (use a 
BerkeleyDBFreenetStore to store the index, and keep the data in files on disk), 
or ram (keep the index and the data in RAM). Only use ram if you know what you 
are doing and have enough RAM to store all your data (and note it will not be 
saved on shutdown)! Changes will not take effect until Freenet has been 
restarted.
+Node.storeTypeLong=Datastore type. Currently this can be bdb-index (use a 
BerkeleyDBFreenetStore to store the index, and keep the data in files on disk), 
or ram (keep the index and the data in RAM). Only use ram if you know what you 
are doing and have enough RAM to store all your data (and note it will not be 
saved on shutdown)!
 Node.swapRInterval=Swap request send interval (ms)
 Node.swapRIntervalLong=Interval between swap attempting to send swap requests 
in milliseconds. Leave this alone!
 Node.throttleLocalTraffic=Throttle local traffic?

Modified: branches/saltedhashstore/freenet/src/freenet/node/Node.java
===================================================================
--- branches/saltedhashstore/freenet/src/freenet/node/Node.java 2008-08-15 
07:49:52 UTC (rev 21884)
+++ branches/saltedhashstore/freenet/src/freenet/node/Node.java 2008-08-15 
08:18:12 UTC (rev 21885)
@@ -178,8 +178,7 @@
                }

                public void set(String val) throws InvalidConfigValueException {
-                       // need restart to effect
-                       config.get("node").set("storeType", val);
+                       throw new InvalidConfigValueException("Store type 
cannot be changed on the fly");
                }

                public String[] getPossibleValues() {


Reply via email to