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

Console: Fix NPE on /configtunnels

Browse Source
This commit is contained in:
zzz
2015-06-23 20:26:02 +00:00
parent 2fbbfa388e
commit e3f64f6edf
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
View File

@@ -415,8 +415,10 @@ public class TunnelPool {
void setSettings(TunnelPoolSettings settings) { void setSettings(TunnelPoolSettings settings) {
if (settings != null && _settings != null) { if (settings != null && _settings != null) {
settings.getAliases().addAll(_settings.getAliases()); if (!(settings.isExploratory() || _settings.isExploratory())) {
settings.setAliasOf(_settings.getAliasOf()); settings.getAliases().addAll(_settings.getAliases());
settings.setAliasOf(_settings.getAliasOf());
}
} }
_settings = settings; _settings = settings;
if (_settings != null) { if (_settings != null) {