Repository: mina-ftpserver Updated Branches: refs/heads/master 3e01b06d0 -> 87e81610c
Applied teh second fix for FTPSERVER-476 Project: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/commit/87e81610 Tree: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/tree/87e81610 Diff: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/diff/87e81610 Branch: refs/heads/master Commit: 87e81610cf830f5a468202879e0432f4350ac6c3 Parents: 3e01b06 Author: Emmanuel Lécharny <elecha...@symas.com> Authored: Wed Nov 2 21:17:59 2016 +0100 Committer: Emmanuel Lécharny <elecha...@symas.com> Committed: Wed Nov 2 21:17:59 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/ftpserver/impl/IODataConnectionFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-ftpserver/blob/87e81610/core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java b/core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java index 19230af..e9d22df 100644 --- a/core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java +++ b/core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java @@ -77,8 +77,8 @@ public class IODataConnectionFactory implements ServerDataConnectionFactory { final FtpIoSession session) { this.session = session; this.serverContext = serverContext; - if ((session != null) && session.getListener().getDataConnectionConfiguration() - .isImplicitSsl()) { + if ((session != null) && (session.getListener() != null) && + session.getListener().getDataConnectionConfiguration().isImplicitSsl()) { secure = true; } }
