Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)

117707 aleahu: MNT-14341 : FTP authentication fails when External authentication is enabled
      - Checked that the instance of the authenticator used is not the same as the one from which the call is made


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117930 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ramona Neamtu
2015-11-18 14:18:19 +00:00
parent cd43fe582c
commit d0d33807ca

View File

@@ -68,6 +68,11 @@ public class SubsystemChainingFtpAuthenticator extends AbstractChainingFtpAuthen
{
ApplicationContext context = this.applicationContextManager.getApplicationContext(instance);
FTPAuthenticatorBase authenticator = (FTPAuthenticatorBase) context.getBean(sourceBeanName);
if(this.getClass().isInstance(authenticator))
{
continue;
}
// Only add active authenticators. E.g. we might have an passthru FTP authenticator that is disabled.
if (!(authenticator instanceof ActivateableBean)
|| ((ActivateableBean) authenticator).isActive())