I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

cleanup wrt multiple app contexts

Browse Source
This commit is contained in:
jrandom
2004-08-01 23:24:47 +00:00
committed by zzz
parent 5bc433d1c8
commit 3a61d260d7
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,13 +51,6 @@ import net.i2p.util.RandomSource;
public class I2PAppContext { public class I2PAppContext {
/** the context that components without explicit root are bound */ /** the context that components without explicit root are bound */
protected static I2PAppContext _globalAppContext; protected static I2PAppContext _globalAppContext;
/**
* Determine if the app context been initialized. If this is false
* and something asks for the globalAppContext, a new one is created,
* otherwise the existing one is used.
*
*/
protected static volatile boolean _globalAppContextInitialized;
private Properties _overrideProps; private Properties _overrideProps;
@ -96,12 +89,10 @@ public class I2PAppContext {
* *
*/ */
public static I2PAppContext getGlobalContext() { public static I2PAppContext getGlobalContext() {
if (!_globalAppContextInitialized) { synchronized (I2PAppContext.class) {
synchronized (I2PAppContext.class) { if (_globalAppContext == null) {
System.err.println("*** Building seperate global context!"); System.err.println("*** Building a seperate global context!");
if (_globalAppContext == null) _globalAppContext = new I2PAppContext(false, null);
_globalAppContext = new I2PAppContext(false, null);
_globalAppContextInitialized = true;
} }
} }
return _globalAppContext; return _globalAppContext;
@ -125,15 +116,10 @@ public class I2PAppContext {
* @param doInit should this context be used as the global one (if necessary)? * @param doInit should this context be used as the global one (if necessary)?
*/ */
private I2PAppContext(boolean doInit, Properties envProps) { private I2PAppContext(boolean doInit, Properties envProps) {
//System.out.println("App context created: " + this);
if (doInit) { if (doInit) {
if (!_globalAppContextInitialized) { synchronized (I2PAppContext.class) {
synchronized (I2PAppContext.class) { if (_globalAppContext == null)
if (_globalAppContext == null) { _globalAppContext = this;
_globalAppContext = this;
_globalAppContextInitialized = true;
}
}
} }
} }
_overrideProps = envProps; _overrideProps = envProps;