From 89b3e3bcb44efab5bdc69d2982b142096df1493c Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 11 Dec 2010 13:31:23 +0000
Subject: [PATCH] * TunnelPoolManager: Fix rare startup NPE
(http://forum.i2p/viewtopic.php?t=5192)
---
.../i2p/router/tunnel/pool/TunnelPoolManager.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
index d246679f34..3a53be5526 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
@@ -131,10 +131,14 @@ public class TunnelPoolManager implements TunnelManagerFacade {
if (info != null)
return info;
}
- info = _inboundExploratory.getTunnel(id);
- if (info != null) return info;
- info = _outboundExploratory.getTunnel(id);
- if (info != null) return info;
+ if (_inboundExploratory != null) {
+ info = _inboundExploratory.getTunnel(id);
+ if (info != null) return info;
+ }
+ if (_outboundExploratory != null) {
+ info = _outboundExploratory.getTunnel(id);
+ if (info != null) return info;
+ }
return null;
}
--
GitLab