Changeset ca6ce37 for core


Ignore:
Timestamp:
Mar 21, 2017 7:26:48 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
4727706
Parents:
a00f11d
Message:

context: New ClientAppManagerImpl? in AppContext?, so registration
works there (for i2psnark-rpc in standalone)

Location:
core/java/src/net/i2p
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • core/java/src/net/i2p/I2PAppContext.java

    ra00f11d rca6ce37  
    99
    1010import net.i2p.app.ClientAppManager;
     11import net.i2p.app.ClientAppManagerImpl;
    1112import net.i2p.client.naming.NamingService;
    1213import net.i2p.crypto.AESEngine;
     
    117118    private volatile File _tmpDir;
    118119    private final Random _tmpDirRand = new Random();
     120    private final ClientAppManager _appManager;
    119121    // split up big lock on this to avoid deadlocks
    120122    private final Object _lock1 = new Object(), _lock2 = new Object(), _lock3 = new Object(), _lock4 = new Object(),
     
    199201        _shutdownTasks = new ConcurrentHashSet<Runnable>(32);
    200202        _portMapper = new PortMapper(this);
     203        _appManager = isRouterContext() ? null : new ClientAppManagerImpl(this);
    201204   
    202205   /*
     
    10081011
    10091012    /**
    1010      *  The RouterAppManager in RouterContext, null always in I2PAppContext
    1011      *  @return null always
     1013     *  As of 0.9.30, returns non-null in I2PAppContext, null in RouterContext.
     1014     *  Prior to that, returned null always.
     1015     *  Overridden in RouterContext to return the RouterAppManager.
     1016     *
     1017     *  @return As of 0.9.30, returns non-null in I2PAppContext, null in RouterContext
    10121018     *  @since 0.9.11, in RouterContext since 0.9.4
    10131019     */
Note: See TracChangeset for help on using the changeset viewer.