From e3f64f6edf6fbba339995fca7e07ec0466783b5f Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 23 Jun 2015 20:26:02 +0000
Subject: [PATCH] Console: Fix NPE on /configtunnels
---
router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
index 196b3b36bc..a1dae253c8 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
@@ -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) {
--
GitLab