Changeset fa0b7d9a

Timestamp:

Dec 31, 2011 4:27:38 PM (9 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

ce0e0b2

Parents:

b3e162e (diff), c82dbd8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge of '3e30b7ad2af5190cd2d124656e272700c53b8219'

and '554846d3fd4ebcdbfaccb3a001098626e0b26ca0'

Files:

• history.txt (modified) (1 diff)
• router/java/src/net/i2p/router/Router.java (modified) (3 diffs)
• router/java/src/net/i2p/router/RouterVersion.java (modified) (1 diff)

history.txt

@@ +1 @@
+2011-12-31 zzz
+ * Fix log NPE when saveConfig() fails at startup, thx kytv
+   (backport from jetty6 branch)
+
+2011-12-30 zzz
+ * New Estonian translation thanks ajutine
+
 2011-12-27 kytv
  * Spanish and Swedish translation updates from Transifex

router/java/src/net/i2p/router/Router.java

@@ -427 +427 @@
     }
     
-    /** this does not use ctx.getConfigDir(), must provide a full path in filename */
+    /**
+     *  this does not use ctx.getConfigDir(), must provide a full path in filename
+     *
+     *  @param ctx will be null at startup when called from constructor
+     */
     private static Properties getConfig(RouterContext ctx, String filename) {
         Log log = null;
@@ -445 +449 @@
                 if (log != null)
                     log.warn("Configuration file " + filename + " does not exist");
+                // normal not to exist at first install
+                //else
+                //    System.err.println("WARNING: Configuration file " + filename + " does not exist");
             }
         } catch (Exception ioe) {
             if (log != null)
                 log.error("Error loading the router configuration from " + filename, ioe);
+            else
+                System.err.println("Error loading the router configuration from " + filename + ": " + ioe);
         }
         return props;
@@ -1194 +1203 @@
             fos.write(buf.toString().getBytes("UTF-8"));
         } catch (IOException ioe) {
-            if (_log.shouldLog(Log.ERROR))
+            // warning, _log will be null when called from constructor
+            if (_log != null)
                 _log.error("Error saving the config to " + _configFilename, ioe);
+            else
+                System.err.println("Error saving the config to " + _configFilename + ": " + ioe);
             return false;
         } finally {

router/java/src/net/i2p/router/RouterVersion.java

@@ -19 +19 @@
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 25;
+    public final static long BUILD = 26;
 
     /** for example "-test" */