Changeset fa0b7d9a


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • history.txt

    rb3e162e rfa0b7d9a  
     12011-12-31 zzz
     2 * Fix log NPE when saveConfig() fails at startup, thx kytv
     3   (backport from jetty6 branch)
     4
     52011-12-30 zzz
     6 * New Estonian translation thanks ajutine
     7
    182011-12-27 kytv
    29 * Spanish and Swedish translation updates from Transifex
  • router/java/src/net/i2p/router/Router.java

    rb3e162e rfa0b7d9a  
    427427    }
    428428   
    429     /** this does not use ctx.getConfigDir(), must provide a full path in filename */
     429    /**
     430     *  this does not use ctx.getConfigDir(), must provide a full path in filename
     431     *
     432     *  @param ctx will be null at startup when called from constructor
     433     */
    430434    private static Properties getConfig(RouterContext ctx, String filename) {
    431435        Log log = null;
     
    445449                if (log != null)
    446450                    log.warn("Configuration file " + filename + " does not exist");
     451                // normal not to exist at first install
     452                //else
     453                //    System.err.println("WARNING: Configuration file " + filename + " does not exist");
    447454            }
    448455        } catch (Exception ioe) {
    449456            if (log != null)
    450457                log.error("Error loading the router configuration from " + filename, ioe);
     458            else
     459                System.err.println("Error loading the router configuration from " + filename + ": " + ioe);
    451460        }
    452461        return props;
     
    11941203            fos.write(buf.toString().getBytes("UTF-8"));
    11951204        } catch (IOException ioe) {
    1196             if (_log.shouldLog(Log.ERROR))
     1205            // warning, _log will be null when called from constructor
     1206            if (_log != null)
    11971207                _log.error("Error saving the config to " + _configFilename, ioe);
     1208            else
     1209                System.err.println("Error saving the config to " + _configFilename + ": " + ioe);
    11981210            return false;
    11991211        } finally {
  • router/java/src/net/i2p/router/RouterVersion.java

    rb3e162e rfa0b7d9a  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 25;
     21    public final static long BUILD = 26;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.