Index: lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raaf2f15ad427fc713849cf696579ab4542ac75c2 --- lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java (.../ConfigurationDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java (.../ConfigurationDAO.java) (revision aaf2f15ad427fc713849cf696579ab4542ac75c2) @@ -46,7 +46,10 @@ @Override @SuppressWarnings("unchecked") public List getAllItems() { - return super.findAll(ConfigurationItem.class); + List result = super.findAll(ConfigurationItem.class); + // close session here because of LDEV-4801 + getSession().close(); + return result; } /** Index: lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java =================================================================== diff -u -r3e7ee4e7075a1f360de05a43f6630ed3d8b95c6b -raaf2f15ad427fc713849cf696579ab4542ac75c2 --- lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java (.../Configuration.java) (revision 3e7ee4e7075a1f360de05a43f6630ed3d8b95c6b) +++ lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java (.../Configuration.java) (revision aaf2f15ad427fc713849cf696579ab4542ac75c2) @@ -201,6 +201,8 @@ @Override public void afterPropertiesSet() { + // it should be wrapped in HibernateSessionManager.openSession() and closeSession(), + // but ConfigurationDAO.getAllItems() does session closing anyway - see LDEV-4801 Configuration.refreshCache(); new Thread("LAMSConfigurationServerStateCheckThread") { @@ -262,7 +264,7 @@ */ public HashMap> arrangeItems(int filter) { List originalList = Configuration.getAllItems(); - HashMap> groupedList = new HashMap>(); + HashMap> groupedList = new HashMap<>(); for (int i = 0; i < originalList.size(); i++) { ConfigurationItem item = originalList.get(i); Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationRefreshCacheJob.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raaf2f15ad427fc713849cf696579ab4542ac75c2 --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationRefreshCacheJob.java (.../ConfigurationRefreshCacheJob.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationRefreshCacheJob.java (.../ConfigurationRefreshCacheJob.java) (revision aaf2f15ad427fc713849cf696579ab4542ac75c2) @@ -33,6 +33,8 @@ public class ConfigurationRefreshCacheJob extends QuartzJobBean { @Override protected void executeInternal(JobExecutionContext context) throws JobExecutionException { + // it should be wrapped in HibernateSessionManager.openSession() and closeSession(), + // but ConfigurationDAO.getAllItems() does session closing anyway - see LDEV-4801 Configuration.refreshCache(); } } \ No newline at end of file