Merge branch 'stable-2.12'

* stable-2.12:
  Set uploader for inline edit
  Update 2.12.4 release notes
  SshDaemon: Set up the session timeout to make sshd.idleTimeout work
  Attach sources for sshd-core and mina-core

Change-Id: I651e8901f96646660790a7ef6a14275f6d94343c
This commit is contained in:
David Pursehouse
2016-08-04 10:15:59 +09:00
3 changed files with 4 additions and 0 deletions

View File

@@ -329,6 +329,7 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
if (getSessionFactory() == null) {
setSessionFactory(createSessionFactory());
}
setupSessionTimeout(getSessionFactory());
daemonAcceptor = createAcceptor();
try {