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

[zot...@freenetproject.org]

Author: zothar
Date: 2006-07-03 17:10:50 +0000 (Mon, 03 Jul 2006)
New Revision: 9440

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/Version.java
Log:
853: Handle a long datastore reconstruction, keeping the wrapper off the node's 
back.

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-07-03 15:42:41 UTC (rev 
9439)
+++ trunk/freenet/src/freenet/node/Node.java    2006-07-03 17:10:50 UTC (rev 
9440)
@@ -1408,6 +1408,7 @@
                                System.err.println("Could not open store: "+e);
                                e.printStackTrace();
                                System.err.println("Attempting to 
reconstruct...");
+                       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;
@@ -1422,6 +1423,7 @@
                                System.err.println("Could not open store: "+e);
                                e.printStackTrace();
                                System.err.println("Attempting to 
reconstruct...");
+                       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;

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-07-03 15:42:41 UTC (rev 
9439)
+++ trunk/freenet/src/freenet/node/Version.java 2006-07-03 17:10:50 UTC (rev 
9440)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 852;
+       private static final int buildNumber = 853;

        /** Oldest build of Fred we will talk to */
        private static final int oldLastGoodBuild = 839;