echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Context: Make files final

Browse Source
This commit is contained in:
zzz
2012-09-25 19:19:27 +00:00
parent e884ca54ef
commit 211782fae4
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/src/net/i2p/I2PAppContext.java
View File

@ -113,13 +113,13 @@ public class I2PAppContext {
private volatile boolean _simpleTimerInitialized; private volatile boolean _simpleTimerInitialized;
private volatile boolean _simpleTimer2Initialized; private volatile boolean _simpleTimer2Initialized;
protected final Set<Runnable> _shutdownTasks; protected final Set<Runnable> _shutdownTasks;
private File _baseDir; private final File _baseDir;
private File _configDir; private final File _configDir;
private File _routerDir; private final File _routerDir;
private File _pidDir; private final File _pidDir;
private File _logDir; private final File _logDir;
private File _appDir; private final File _appDir;
private File _tmpDir; private volatile File _tmpDir;
// split up big lock on this to avoid deadlocks // split up big lock on this to avoid deadlocks
private final Object _lock1 = new Object(), _lock2 = new Object(), _lock3 = new Object(), _lock4 = new Object(), private final Object _lock1 = new Object(), _lock2 = new Object(), _lock3 = new Object(), _lock4 = new Object(),
_lock5 = new Object(), _lock6 = new Object(), _lock7 = new Object(), _lock8 = new Object(), _lock5 = new Object(), _lock6 = new Object(), _lock7 = new Object(), _lock8 = new Object(),
@ -210,11 +210,9 @@ public class I2PAppContext {
if (envProps != null) if (envProps != null)
_overrideProps.putAll(envProps); _overrideProps.putAll(envProps);
_shutdownTasks = new ConcurrentHashSet(32); _shutdownTasks = new ConcurrentHashSet(32);
initializeDirs();
_portMapper = new PortMapper(this); _portMapper = new PortMapper(this);
}
/** /*
* Directories. These are all set at instantiation and will not be changed by * Directories. These are all set at instantiation and will not be changed by
* subsequent property changes. * subsequent property changes.
* All properties, if set, should be absolute paths. * All properties, if set, should be absolute paths.
@ -259,7 +257,7 @@ public class I2PAppContext {
* All dirs except the base are created if they don't exist, but the creation will fail silently. * All dirs except the base are created if they don't exist, but the creation will fail silently.
* @since 0.7.6 * @since 0.7.6
*/ */
private void initializeDirs() {
String s = getProperty("i2p.dir.base", System.getProperty("user.dir")); String s = getProperty("i2p.dir.base", System.getProperty("user.dir"));
_baseDir = new File(s); _baseDir = new File(s);