propagate from branch 'i2p.i2p.zzz.test' (head eb755dae363d71808cb93ae1c6c976c1ec5df5d2)

to branch 'i2p.i2p' (head 25097fabfedcbe372d42dcddaf89b5279e9285e4)
This commit is contained in:
zzz
2009-05-01 12:56:10 +00:00
15 changed files with 73 additions and 19 deletions

View File

@ -59,10 +59,10 @@ class CreateSessionJob extends JobImpl {
// XXX props.putAll(Router.getInstance().getConfigMap());
// override them by the client's settings
props.putAll(_runner.getConfig().getOptions());
props.putAll(cfg.getOptions());
// and load 'em up (using anything not yet set as the software defaults)
settings.readFromProperties(props);
getContext().tunnelManager().buildTunnels(_runner.getConfig().getDestination(), settings);
getContext().tunnelManager().buildTunnels(cfg.getDestination(), settings);
}
}