[freenet-cvs] r9446 - trunk/freenet/src/freenet/node

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-07-03 20:28:57 +0000 (Mon, 03 Jul 2006)
New Revision: 9446

Modified:
   trunk/freenet/src/freenet/node/Node.java
Log:
Various on a StringCallback and next part of r9445

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-07-03 20:25:48 UTC (rev 
9445)
+++ trunk/freenet/src/freenet/node/Node.java    2006-07-03 20:28:57 UTC (rev 
9446)
@@ -147,7 +147,7 @@
                }

                public void set(String val) throws InvalidConfigValueException {
-                       if(val == get()) return;
+                       if(val.equals(get())) return;
                        throw new InvalidConfigValueException("Cannot be 
updated on the fly");
                }
        }
@@ -645,8 +645,8 @@
        private static final boolean USE_RAM_PUBKEYS_CACHE = true;

        // various metrics
-       public RunningAverage MissRoutingDistance = new 
TimeDecayingRunningAverage(0.0, 180000, 0.0, 1.0);
-       public RunningAverage BackedoffPercent = new 
TimeDecayingRunningAverage(0.0, 180000, 0.0, 1.0);
+       public RunningAverage missRoutingDistance = new 
TimeDecayingRunningAverage(0.0, 180000, 0.0, 1.0);
+       public RunningAverage backedoffPercent = new 
TimeDecayingRunningAverage(0.0, 180000, 0.0, 1.0);

        /**
         * Read all storable settings (identity etc) from the node file.
@@ -1408,7 +1408,7 @@
                                System.err.println("Could not open store: "+e);
                                e.printStackTrace();
                                System.err.println("Attempting to 
reconstruct...");
-                       WrapperManager.signalStarting((int) Integer.MAX_VALUE);
+                               WrapperManager.signalStarting((int) 
Integer.MAX_VALUE);
                                tmp = new 
BerkeleyDBFreenetStore(storeDir.getPath()+File.separator+"store-"+portNumber, 
maxStoreKeys, 32768, CHKBlock.TOTAL_HEADERS_LENGTH, 
BerkeleyDBFreenetStore.TYPE_CHK);
                        }
                        chkDatastore = tmp;
@@ -1423,7 +1423,7 @@
                                System.err.println("Could not open store: "+e);
                                e.printStackTrace();
                                System.err.println("Attempting to 
reconstruct...");
-                       WrapperManager.signalStarting((int) Integer.MAX_VALUE);
+                               WrapperManager.signalStarting((int) 
Integer.MAX_VALUE);
                                tmp = new 
BerkeleyDBFreenetStore(storeDir.getPath()+File.separator+"pubkeystore-"+portNumber,
 maxStoreKeys, DSAPublicKey.PADDED_SIZE, 0, BerkeleyDBFreenetStore.TYPE_PUBKEY);
                        }
                        this.pubKeyDatastore = tmp;