[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mina-commits
Subject:    [1/2] mina-sshd git commit: [SSHD-724] SshClient#checkConfig: Do not overwrite predefined factories
From:       lgoldstein () apache ! org
Date:       2016-12-26 18:29:40
Message-ID: ff752658654d485fa55bb48312c9d001 () git ! apache ! org
[Download RAW message or body]

Repository: mina-sshd
Updated Branches:
  refs/heads/master 14c1a31e9 -> f9b976073


[SSHD-724] SshClient#checkConfig: Do not overwrite predefined factories


Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/385f21de
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/385f21de
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/385f21de

Branch: refs/heads/master
Commit: 385f21deddb758d6e511dd174b45c957e2a4c954
Parents: 14c1a31
Author: David Ostrovsky <david@ostrovsky.org>
Authored: Mon Dec 26 19:36:52 2016 +0200
Committer: Lyor Goldstein <lyor.goldstein@gmail.com>
Committed: Mon Dec 26 19:36:52 2016 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/sshd/client/SshClient.java      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/385f21de/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
                
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java \
b/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java index \
                cd40c7e..16f9d91 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
@@ -400,9 +400,11 @@ public class SshClient extends AbstractFactoryManager implements \
ClientFactoryMa  factories = forwarders;
             } else {
                 // create a copy in case un-modifiable original
-                factories = new ArrayList<>(factories.size() + forwarders.size());
-                factories.addAll(factories);
-                factories.addAll(forwarders);
+                List<NamedFactory<Channel>> factories2 =
+                    new ArrayList<>(factories.size() + forwarders.size());
+                factories2.addAll(factories);
+                factories2.addAll(forwarders);
+                factories = factories2;
             }
 
             setChannelFactories(factories);


[prev in list] [next in list] [prev in thread] [next in thread]