Fix context properties initialization; history for test4 prop, -1

2011-01-31 15:44:00 +00:00
parent e721ddd3a4
commit 97f93c64e6
3 changed files with 41 additions and 2 deletions
--- a/core/java/src/net/i2p/I2PAppContext.java
+++ b/core/java/src/net/i2p/I2PAppContext.java
@ -171,7 +171,9 @@ public class I2PAppContext {
                    _globalAppContext = this;
            }
        }
-        _overrideProps = new I2PProperties(envProps);
+        _overrideProps = new I2PProperties();
+        if (envProps != null)
+            _overrideProps.putAll(envProps);
        _statManager = null;
        _sessionKeyManager = null;
        _namingService = null;