Changeset cddc1b3


Ignore:
Timestamp:
Dec 12, 2015 1:21:29 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
2c1b9c2
Parents:
89bdbed
Message:

Another deadlock fix: remove sync in Router.isHidden()

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • history.txt

    r89bdbed rcddc1b3  
     12015-12-12 zzz
     2 * Router:
     3   - Add family public key to router info (ticket #1510)
     4   - More deadlock prevention (ticket #1722)
     5
    162015-12-11 zzz
    27 * Logs: Windows line ending fixes
  • router/java/src/net/i2p/router/Router.java

    r89bdbed rcddc1b3  
    853853           
    854854            ri.setOptions(stats);
     855            // deadlock thru createAddresses() thru SSU REA... move outside lock?
    855856            ri.setAddresses(_context.commSystem().createAddresses());
    856857
     
    10031004   
    10041005    /*
    1005      *
    1006      *  Warning - risk of deadlock - do not call while holding locks
     1006     *  This checks the config only. We don't check the current RI
     1007     *  due to deadlocks.
    10071008     *
    10081009     */
    10091010    public boolean isHidden() {
    1010         RouterInfo ri;
    1011         synchronized (_routerInfoLock) {
    1012             ri = _routerInfo;
    1013         }
    1014         if ( (ri != null) && (ri.isHidden()) )
     1011        //RouterInfo ri;
     1012        //synchronized (_routerInfoLock) {
     1013        //    ri = _routerInfo;
     1014        //}
     1015        //if ( (ri != null) && (ri.isHidden()) )
     1016        //    return true;
     1017        if (_context.getBooleanProperty(PROP_HIDDEN))
    10151018            return true;
    10161019        String h = _context.getProperty(PROP_HIDDEN_HIDDEN);
  • router/java/src/net/i2p/router/RouterVersion.java

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