Merge branch 'maint-rel-1.6' into develop

This commit is contained in:
j2blake 2013-11-01 15:40:33 -04:00
commit 4d8bcc6fae

View file

@ -267,7 +267,8 @@ public class ConfigurationPropertiesSetup implements ServletContextListener {
@Override @Override
public void contextDestroyed(ServletContextEvent sce) { public void contextDestroyed(ServletContextEvent sce) {
ConfigurationProperties.removeBean(sce.getServletContext()); // No need to remove the bean. It's only a map of strings, and if we
// restart the app, it will be replaced.
} }
/** /**