Commit f3780c9f authored by Brian Major's avatar Brian Major
Browse files

ac2 - Fixed pool closing bug

parent 154f272a

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapConnectionPool.java

+0 −8
Original line number Diff line number Diff line
@@ -169,14 +169,6 @@ public class LdapConnectionPool 
        profiler.checkpoint("Pool closed.");

    }



    @Override

    public void finalize()

    {

        // just in case the client doesn't call shutdown()

        if (!pool.isClosed())

            pool.close();

    }



    private LDAPConnectionPool createPool(LdapConfig config, LdapPool poolConfig, String poolName, String bindID, String bindPW)



    {

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapPersistence.java

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ public abstract class LdapPersistence 
                            {

                                logger.warn("Could not unbind previous JNDI instance", e);

                            }

                            ic.bind(LDAP_POOL_JNDI_NAME, pools);

                            ic.bind(LDAP_POOL_JNDI_NAME, newPools);

                            profiler.checkpoint("Rebuild pools");

                            poolRecreated = true;

                        }