Console: Fix NPE on /configtunnels

This commit is contained in:
zzz
2015-06-23 20:26:02 +00:00
parent 2fbbfa388e
commit e3f64f6edf

View File

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