Fixed NPE in TUNNEL

belaban · Apr 15, 2020 · 533b409 · 533b409
1 parent 298e16d
commit 533b409
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/org/jgroups/protocols/TUNNEL.java b/src/org/jgroups/protocols/TUNNEL.java
@@ -139,8 +139,9 @@ public void init() throws Exception {
         sock=getSocketFactory().createDatagramSocket("jgroups.tunnel.ucast_sock", bind_port, bind_addr);
     }
 
-    public void destroy() {        
-        stubManager.destroyStubs();
+    public void destroy() {
+        if(stubManager != null)
+            stubManager.destroyStubs();
         Util.close(sock);
         super.destroy();
     }
@@ -165,8 +166,13 @@ public Object down(Event evt) {
                 String logical_name=org.jgroups.util.NameCache.get(local);
                 stubManager = new RouterStubManager(this,group,local, logical_name, physical_addr, getReconnectInterval()).useNio(this.use_nio);
                 for(InetSocketAddress gr : gossip_routers) {
-                    stubManager.createAndRegisterStub(new IpAddress(bind_addr, bind_port), new IpAddress(gr.getAddress(), gr.getPort()))
-                      .receiver(this).set("tcp_nodelay", tcp_nodelay);
+                    try {
+                        stubManager.createAndRegisterStub(new IpAddress(bind_addr, bind_port), new IpAddress(gr.getAddress(), gr.getPort()))
+                          .receiver(this).set("tcp_nodelay", tcp_nodelay);
+                    }
+                    catch(Throwable t) {
+                        log.error("%s: failed creating stub to %s: %s", local, bind_addr + ":" + bind_port, t);
+                    }
                 }
                 stubManager.connectStubs();
                 break;