@@ -562,8 +562,13 @@ synchronized static void load(ConfigServerImpl cs, ConfigImpl config, ConfigWebI
562562 if (LOG ) LogUtil .logGlobal (ThreadLocalPageContext .getConfig (cs == null ? config : cs ), Log .LEVEL_DEBUG , ConfigWebFactory .class .getName (), "loaded filesystem" );
563563
564564 if (!essentialOnly ) {
565- _loadExtensionBundles (cs , config , root , log );
565+ boolean installedExtensions = _loadExtensionBundles (cs , config , root , log );
566566 if (LOG ) LogUtil .logGlobal (ThreadLocalPageContext .getConfig (cs == null ? config : cs ), Log .LEVEL_DEBUG , ConfigWebFactory .class .getName (), "loaded extension" );
567+ if (installedExtensions ) {
568+ _loadFilesystem (cs , config , root , doNew , log );
569+ if (LOG ) LogUtil .logGlobal (ThreadLocalPageContext .getConfig (cs == null ? config : cs ), Log .LEVEL_DEBUG , ConfigWebFactory .class .getName (),
570+ "loaded filesystem again after installing extensions" );
571+ }
567572
568573 }
569574 else {
@@ -4948,7 +4953,7 @@ private static void _loadCFX(ConfigServerImpl configServer, ConfigImpl config, S
49484953 * @param doc
49494954 * @param log
49504955 */
4951- private static void _loadExtensionBundles (ConfigServerImpl cs , ConfigImpl config , Struct root , Log log ) {
4956+ private static boolean _loadExtensionBundles (ConfigServerImpl cs , ConfigImpl config , Struct root , Log log ) {
49524957 Log deployLog = config .getLog ("deploy" );
49534958 if (deployLog != null ) log = deployLog ;
49544959 try {
@@ -4960,7 +4965,7 @@ private static void _loadExtensionBundles(ConfigServerImpl cs, ConfigImpl config
49604965 String md5 = CollectionUtil .md5 (children );
49614966 if (!changed ) {
49624967 if (md5 .equals (config .getExtensionsMD5 ())) {
4963- return ;
4968+ return false ;
49644969 }
49654970 }
49664971
@@ -5059,6 +5064,7 @@ private static void _loadExtensionBundles(ConfigServerImpl cs, ConfigImpl config
50595064 ExceptionUtil .rethrowIfNecessary (t );
50605065 log (config , log , t );
50615066 }
5067+ return true ;
50625068 }
50635069
50645070 private static void _loadExtensionDefinition (ConfigServerImpl cs , ConfigImpl config , Struct root , Log log ) {
0 commit comments