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

[t...@freenetproject.org]

Author: toad
Date: 2007-12-19 21:29:21 +0000 (Wed, 19 Dec 2007)
New Revision: 16735

Modified:
   trunk/freenet/src/freenet/node/Node.java
Log:
Don't log the exceptions if both files don't exist.

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2007-12-19 19:54:47 UTC (rev 
16734)
+++ trunk/freenet/src/freenet/node/Node.java    2007-12-19 21:29:21 UTC (rev 
16735)
@@ -790,15 +790,18 @@
                        }
                }

+               File nodeFile = new File(nodeDir, 
"node-"+getDarknetPortNumber());
+               File nodeFileBackup = new File(nodeDir, 
"node-"+getDarknetPortNumber()+".bak");
                // After we have set up testnet and IP address, load the node 
file
                try {
                        // FIXME should take file directly?
-                       readNodeFile(new File(nodeDir, 
"node-"+getDarknetPortNumber()).getPath(), random);
+                       readNodeFile(nodeFile.getPath(), random);
                } catch (IOException e) {
                        try {
                                System.err.println("Trying to read node file 
backup ...");
-                               readNodeFile(new File(nodeDir, 
"node-"+getDarknetPortNumber()+".bak").getPath(), random);
+                               readNodeFile(nodeFileBackup.getPath(), random);
                        } catch (IOException e1) {
+                               if(nodeFile.exists() || 
nodeFileBackup.exists()) {
                                System.err.println("No node file or cannot 
read, (re)initialising crypto etc");
                                System.err.println(e1.toString());
                                e1.printStackTrace();
@@ -806,6 +809,9 @@
                                System.err.println(e.toString());
                                e.printStackTrace();
                                initNodeFileSettings(random);
+                               } else {
+                                       System.err.println("Creating new 
cryptographic keys...");
+                               }
                        }
                }