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

* I2PAppContext: Improved synching in constructor

Browse Source
This commit is contained in:
zzz
2012-10-07 20:48:25 +00:00
parent d80340f0ae
commit 3ceb83d40e
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ import net.i2p.util.I2PProperties.I2PPropertyCallback;
* contexts should build their own context as soon as possible (within the main(..)) * contexts should build their own context as soon as possible (within the main(..))
* so that any referenced components will latch on to that context instead of * so that any referenced components will latch on to that context instead of
* instantiating a new one. However, there are situations in which both can be * instantiating a new one. However, there are situations in which both can be
* relevent. * relevant.
* *
*/ */
public class I2PAppContext { public class I2PAppContext {
@ -196,16 +196,7 @@ public class I2PAppContext {
* Will only apply if there is no global context now. * Will only apply if there is no global context now.
*/ */
private I2PAppContext(boolean doInit, Properties envProps) { private I2PAppContext(boolean doInit, Properties envProps) {
if (doInit) { synchronized (I2PAppContext.class) {
synchronized (I2PAppContext.class) {
if (_globalAppContext == null) {
_globalAppContext = this;
} else {
System.out.println("Warning - New context not replacing old one, you now have a second one");
(new Exception("I did it")).printStackTrace();
}
}
}
_overrideProps = new I2PProperties(); _overrideProps = new I2PProperties();
if (envProps != null) if (envProps != null)
_overrideProps.putAll(envProps); _overrideProps.putAll(envProps);
@ -319,6 +310,16 @@ public class I2PAppContext {
System.err.println("PID directory: " + _pidDir.getAbsolutePath()); System.err.println("PID directory: " + _pidDir.getAbsolutePath());
System.err.println("Temp directory: " + getTempDir().getAbsolutePath()); System.err.println("Temp directory: " + getTempDir().getAbsolutePath());
******/ ******/
if (doInit) {
if (_globalAppContext == null) {
_globalAppContext = this;
} else {
System.out.println("Warning - New context not replacing old one, you now have a second one");
(new Exception("I did it")).printStackTrace();
}
}
} // synch
} }
/** /**