Index: oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/PoolableUnboundConnectionFactory.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/PoolableUnboundConnectionFactory.java b/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/PoolableUnboundConnectionFactory.java --- a/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/PoolableUnboundConnectionFactory.java (revision 2fdacb4989ce391c51a1dd9204cf25ecbb97307c) +++ b/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/PoolableUnboundConnectionFactory.java (date 1627078106545) @@ -96,9 +96,7 @@ * {@inheritDoc} */ public LdapConnection create() throws LdapException { - LdapNetworkConnection connection = config.isUseTls() - ? new TlsGuardingConnection(config) - : new LdapNetworkConnection(config); + LdapNetworkConnection connection = new LdapNetworkConnection(config); connection.connect(); log.debug("creating new connection: {}", connection); return connection; @@ -124,28 +122,4 @@ log.debug("validating connection {}: {}", connection, valid); return valid; } - - /** - * internal helper class that guards the original ldap connection from starting TLS if already started.. - * this is to ensure that pooled connections can be 'bind()' several times. - * - * @see org.apache.directory.ldap.client.api.LdapNetworkConnection#bindAsync(org.apache.directory.api.ldap.model.message.BindRequest) - */ - private static final class TlsGuardingConnection extends LdapNetworkConnection { - - private boolean tlsStarted; - - private TlsGuardingConnection(LdapConnectionConfig config) { - super(config); - } - - @Override - public void startTls() throws LdapException { - if (tlsStarted) { - return; - } - super.startTls(); - tlsStarted = true; - } - } }