From 99bc1f16ac2619dbf4bc6de942a158d61c0587e4 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 11 Mar 2016 17:27:10 +0000 Subject: [PATCH] Merged 5.1.N (5.1.1) to HEAD (5.1) 117930 rneamtu: 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/HEAD/root@123587 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../subsystems/SubsystemChainingFtpAuthenticator.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingFtpAuthenticator.java b/source/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingFtpAuthenticator.java index 06920feb15..0cc3dac820 100644 --- a/source/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingFtpAuthenticator.java +++ b/source/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingFtpAuthenticator.java @@ -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())