Repository: mina-ftpserver Updated Branches: refs/heads/master 8f39414e2 -> 3e01b06d0
Added a check on the session, as suggested by Manuel Dominguez Sarmiento (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/94ffe900 Tree: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/tree/94ffe900 Diff: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/diff/94ffe900 Branch: refs/heads/master Commit: 94ffe900f5ccda33e7f0c0827b463d22a88e8907 Parents: 8f39414 Author: Emmanuel Lécharny <elecha...@symas.com> Authored: Wed Nov 2 18:26:55 2016 +0100 Committer: Emmanuel Lécharny <elecha...@symas.com> Committed: Wed Nov 2 18:26:55 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/ftpserver/impl/IODataConnectionFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-ftpserver/blob/94ffe900/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 90a321e..19230af 100644 --- a/core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java +++ b/core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java @@ -77,7 +77,7 @@ public class IODataConnectionFactory implements ServerDataConnectionFactory { final FtpIoSession session) { this.session = session; this.serverContext = serverContext; - if (session.getListener().getDataConnectionConfiguration() + if ((session != null) && session.getListener().getDataConnectionConfiguration() .isImplicitSsl()) { secure = true; }
