Changeset 4910266d


Ignore:
Timestamp:
Nov 20, 2013 11:10:52 PM (7 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
817f531
Parents:
24ae66d (diff), 9de57a5 (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 '63ea1d70b3fd3886a050d7b196cd7ae261844164'

and '6a57f7039fe5697b9770d642ac1d4653e4b9878c'

Location:
router/java/src/net/i2p/router
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/RouterVersion.java

    r24ae66d r4910266d  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 28;
     21    public final static long BUILD = 29;
    2222
    2323    /** for example "-test" */
    24     public final static String EXTRA = "";
     24    public final static String EXTRA = "-rc";
    2525    public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
    2626    public static void main(String args[]) {
  • router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java

    r24ae66d r4910266d  
    571571            if ( (msg.getMessageExpiration() < minTime) || (msg.getMessage().getMessageExpiration() < minTime) ||
    572572                 (msg.getMessageExpiration() > maxTime) || (msg.getMessage().getMessageExpiration() > maxTime) ) {
    573                 if (_log.shouldLog(Log.ERROR))
    574                     _log.error("Not dispatching a gateway message for tunnel " + msg.getTunnelId().getTunnelId()
     573                if (_log.shouldLog(Log.WARN))
     574                    _log.warn("Not dispatching a gateway message for tunnel " + msg.getTunnelId().getTunnelId()
    575575                               + " as the wrapper's expiration is in " + DataHelper.formatDuration(msg.getMessageExpiration()-before)
    576576                               + " and/or the content's expiration is in " + DataHelper.formatDuration(msg.getMessage().getMessageExpiration()-before)
Note: See TracChangeset for help on using the changeset viewer.