propagate from branch 'i2p.i2p' (head 687bab4d9de8e6686e2734069dfb72f6f2134124)

to branch 'i2p.i2p.zzz.test4' (head 9580436bb581971920ea96e58861142c546c861b)
This commit is contained in:
zzz
2011-01-07 00:37:51 +00:00
96 changed files with 1519 additions and 776 deletions

View File

@@ -118,8 +118,8 @@ public class I2PTunnel implements Logging, EventDispatcher {
_tunnelId = ++__tunnelId;
_log = _context.logManager().getLog(I2PTunnel.class);
_event = new EventDispatcherImpl();
Properties p = new Properties();
p.putAll(System.getProperties());
// as of 0.8.4, include context properties
Properties p = _context.getProperties();
_clientOptions = p;
_sessions = new ArrayList(1);