diff --git a/pom.xml b/pom.xml index 5dcb41870..d2288fb9c 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.entando.entando entando-engine jar - 6.5.5 + 6.5.6 Entando Core: Engine Entando Engine: an agile, modern and user-centric open source Portal platform. http://www.entando.com/ diff --git a/src/main/java/com/agiletec/aps/util/ApsWebApplicationUtils.java b/src/main/java/com/agiletec/aps/util/ApsWebApplicationUtils.java index 5ab3e02e9..a5e01cf53 100644 --- a/src/main/java/com/agiletec/aps/util/ApsWebApplicationUtils.java +++ b/src/main/java/com/agiletec/aps/util/ApsWebApplicationUtils.java @@ -164,8 +164,14 @@ private static void executeSystemRefresh(WebApplicationContext wac) throws Throw final String[] beansNames = wac.getBeanNamesForType(RefreshableBean.class); final int beansCount = beansNames.length; - reloadRefreshableBean(configManager, SystemConstants.BASE_CONFIG_MANAGER, + try { + reloadRefreshableBean(configManager, SystemConstants.BASE_CONFIG_MANAGER, (int) ( 100.0 / beansCount)); + reloadInfo.put(SystemConstants.BASE_CONFIG_MANAGER, ""); + } catch (Throwable t) { + reloadInfo.put(SystemConstants.BASE_CONFIG_MANAGER, t.getMessage()); + throw t; + } for (int i = 0; i < beansCount; i++) { Object bean = null; @@ -178,7 +184,7 @@ private static void executeSystemRefresh(WebApplicationContext wac) throws Throw reloadProgress.set(progress); reloadRefreshableBean(bean, beansNames[i], progress); reloadInfo.put(beansNames[i], ""); - } catch (Exception t) { + } catch (Throwable t) { reloadInfo.put(beansNames[i], t.getMessage()); ApsDeepDebug.print("service-reload", "RELOADING " + beansNames[i] + " COMPLETED WITH ERRORS"); // NOSONAR logger.error("error in executeSystemRefresh", t);