From 4183776adbb9ef8eae632c4e878747be053e22d6 Mon Sep 17 00:00:00 2001
From: David Solin <solind@Gallifrey.local>
Date: Tue, 16 Aug 2016 09:17:30 -0500
Subject: [PATCH] Updates per Jeroen van Erp.

---
 src/main/java/net/schmizz/sshj/SSHClient.java | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main/java/net/schmizz/sshj/SSHClient.java b/src/main/java/net/schmizz/sshj/SSHClient.java
index a24cf4ae..daecc5a6 100644
--- a/src/main/java/net/schmizz/sshj/SSHClient.java
+++ b/src/main/java/net/schmizz/sshj/SSHClient.java
@@ -139,7 +139,7 @@ public class SSHClient
     /** {@code ssh-connection} service */
     protected final Connection conn;
 
-    private List<LocalPortForwarder> forwarders;
+    private final List<LocalPortForwarder> forwarders = new ArrayList<LocalPortForwarder>();
 
     /** Default constructor. Initializes this object using {@link DefaultConfig}. */
     public SSHClient() {
@@ -433,15 +433,14 @@ public class SSHClient
     @Override
     public void disconnect()
             throws IOException {
-        if (forwarders != null) {
-            for (LocalPortForwarder forwarder : forwarders) {
-                try {
-                    forwarder.close();
-                } catch (IOException e) {
-                    log.warn("Error closing forwarder", e);
-                }
+        for (LocalPortForwarder forwarder : forwarders) {
+            try {
+                forwarder.close();
+            } catch (IOException e) {
+                log.warn("Error closing forwarder", e);
             }
         }
+        forwarders.clear();
         trans.disconnect();
         super.disconnect();
     }
@@ -659,9 +658,6 @@ public class SSHClient
      */
     public LocalPortForwarder newLocalPortForwarder(LocalPortForwarder.Parameters parameters,
                                                     ServerSocket serverSocket) {
-        if (forwarders == null) {
-            forwarders = new ArrayList<LocalPortForwarder>();
-        }
         LocalPortForwarder forwarder = new LocalPortForwarder(conn, parameters, serverSocket);
         forwarders.add(forwarder);
         return forwarder;