Changeset e1fcad68


Ignore:
Timestamp:
Nov 24, 2013 1:20:11 AM (7 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
c6f2d49
Parents:
8478bfb (diff), ffa03f2 (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:

propagate from branch 'i2p.i2p' (head 72c44737466e553fec443a79fffa7636894fe383)

to branch 'i2p.i2p.str4d.cleanup' (head 5a2425d7523b732840e55039f88cea5699f1aa83)

Files:
5 edited
4 moved

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java

    r8478bfb re1fcad68  
    264264                    if (_log.shouldLog(Log.WARN))
    265265                        _log.warn(getTunnel().getClientOptions().getProperty("inbound.nickname") + ": Built a new destination on resume");
     266                    // make sure the old one is closed
     267                    sockMgr.destroySocketManager();
    266268                    newManager = true;
    267269                }  // else the old socket manager will reconnect the old session if necessary
     
    321323                    _log.info(tunnel.getClientOptions().getProperty("inbound.nickname") + ": Building a new socket manager since the old one closed [s=" + s + "]");
    322324                tunnel.removeSession(s);
     325                // make sure the old one is closed
     326                socketManager.destroySocketManager();
    323327                // We could be here a LONG time, holding the lock
    324328                socketManager = buildSocketManager(tunnel, pkf);
  • apps/susimail/src/src/i2p/susi/webmail/WebMail.java

    r8478bfb re1fcad68  
    12821282                        if( sessionObject.state == STATE_SHOW ) {
    12831283                                processMessageButtons( sessionObject, request );
    1284                                 Mail mail = sessionObject.mailCache.getMail( sessionObject.showUIDL, MailCache.FETCH_ALL );
    1285                                 if( mail != null && mail.error.length() > 0 ) {
    1286                                         sessionObject.error += mail.error;
    1287                                         mail.error = "";
     1284                                // If the last message has just been deleted then
     1285                                // sessionObject.state = STATE_LIST and
     1286                                // sessionObject.showUIDL = null
     1287                                if ( sessionObject.showUIDL != null ) {
     1288                                        Mail mail = sessionObject.mailCache.getMail( sessionObject.showUIDL, MailCache.FETCH_ALL );
     1289                                        if( mail != null && mail.error.length() > 0 ) {
     1290                                                sessionObject.error += mail.error;
     1291                                                mail.error = "";
     1292                                        }
    12881293                                }
    12891294                        }
  • history.txt

    r8478bfb re1fcad68  
     12013-11-23 zzz
     2 * i2ptunnel: Clean up old timer threads
     3
     42013-11-23 str4d
     5 * susimail: Fix NPE when deleting last message (ticket #414)
     6
    172013-11-19 kytv
    2 
    38 * Translation updates and start of Japanese translation pulled from Transifex
    49
  • router/java/src/net/i2p/router/RouterVersion.java

    r8478bfb re1fcad68  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 30;
     21    public final static long BUILD = 31;
    2222
    2323    /** for example "-test" */
  • router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java

    r8478bfb re1fcad68  
    157157        if (_toTry.isEmpty()) {
    158158            if (_log.shouldLog(Log.WARN))
    159                 _log.warn(getJobId() + ": Iterative search for " + _key + " had no peers to send to");
     159                _log.warn(getJobId() + ": ISJ for " + _key + " had no peers to send to");
    160160            // no floodfill peers, fail
    161161            failed();
     
    169169        _out = getContext().messageRegistry().registerPending(replySelector, onReply, onTimeout, _timeoutMs);
    170170        if (_log.shouldLog(Log.INFO))
    171             _log.info(getJobId() + ": Iterative search for " + _key + " (rkey " + _rkey + ") timeout " +
     171            _log.info(getJobId() + ": New ISJ for " +
     172                      (_isLease ? "LS " : "RI ") +
     173                      _key + " (rkey " + _rkey + ") timeout " +
    172174                      DataHelper.formatDuration(_timeoutMs) + " toTry: "  + DataHelper.toString(_toTry));
    173175        retry();
     
    252254            dlm.setSearchKey(_key);
    253255           
    254             if (_log.shouldLog(Log.INFO))
    255                 _log.info(getJobId() + ": Iterative search for " + _key + " to " + peer);
     256            if (_log.shouldLog(Log.INFO)) {
     257                int tries;
     258                synchronized(this) {
     259                    tries = _unheardFrom.size() + _failedPeers.size();
     260                }
     261                _log.info(getJobId() + ": ISJ try " + tries + " for " + _key + " to " + peer);
     262            }
    256263            long now = getContext().clock().now();
    257264            _sentTime.put(peer, Long.valueOf(now));
     
    271278                    }
    272279                    outMsg = MessageWrapper.wrap(getContext(), dlm, ri);
     280                    // ElG can take a while so do a final check before we send it,
     281                    // a response may have come in.
     282                    if (_dead) {
     283                        if (_log.shouldLog(Log.DEBUG))
     284                            _log.debug(getJobId() + ": aborting send, finished while wrapping msg to " + peer);
     285                        return;
     286                    }
    273287                    if (_log.shouldLog(Log.DEBUG))
    274288                        _log.debug(getJobId() + ": Encrypted DLM for " + _key + " to " + peer);
     
    376390        if (_log.shouldLog(Log.INFO)) {
    377391            long timeRemaining = _expiration - getContext().clock().now();
    378             _log.info(getJobId() + ": Iterative search for " + _key + " failed with " + timeRemaining + " remaining after " + time +
     392            _log.info(getJobId() + ": ISJ for " + _key + " failed with " + timeRemaining + " remaining after " + time +
    379393                      ", peers queried: " + tries);
    380394        }
     
    411425        long time = System.currentTimeMillis() - _created;
    412426        if (_log.shouldLog(Log.INFO))
    413             _log.info(getJobId() + ": Iterative search for " + _key + " successful after " + time +
     427            _log.info(getJobId() + ": ISJ for " + _key + " successful after " + time +
    414428                      ", peers queried: " + tries);
    415429        getContext().statManager().addRateData("netDb.successTime", time, 0);
Note: See TracChangeset for help on using the changeset viewer.