Skip to content
Permalink
Browse files

Improved: Access configurations inside ‘loadContainersFromConfigurati…

…ons’

(OFBIZ-11100)

This avoids passing an extra argument to
‘loadContainersFromConfigurations’.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1863022 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
mthl committed Jul 13, 2019
1 parent a4fe696 commit 5a7b0e694785d6171836161c25471e46fb6eba5b
@@ -72,8 +72,7 @@ public synchronized void load(Config config, List<StartupCommand> ofbizCommands)

// Load containers defined in components.
Debug.logInfo("[Startup] Loading containers...", module);
List<ContainerConfig.Configuration> componentContainerConfigs = ComponentConfig.getAllConfigurations();
loadedContainers.addAll(loadContainersFromConfigurations(componentContainerConfigs, config, ofbizCommands));
loadedContainers.addAll(loadContainersFromConfigurations(config, ofbizCommands));

// Start all containers loaded from above steps
startLoadedContainers();
@@ -94,17 +93,15 @@ private static boolean intersects(Collection<?> a, Collection<?> b) {
/**
* Loads the available containers which are matching the configured loaders.
*
* @param containerConfigs the list of available container configurations
* @param config the configuration defining the loaders to match
* @param ofbizCommands the parsed commands line arguments used by the containers
* @return a list of loaded containers.
* @throws StartupException when a container fails to load.
*/
private static List<Container> loadContainersFromConfigurations(List<ContainerConfig.Configuration> containerConfigs,
Config config, List<StartupCommand> ofbizCommands) throws StartupException {

private static List<Container> loadContainersFromConfigurations(Config config, List<StartupCommand> ofbizCommands)
throws StartupException {
List<Container> loadContainers = new ArrayList<>();
for (ContainerConfig.Configuration containerCfg : containerConfigs) {
for (ContainerConfig.Configuration containerCfg : ComponentConfig.getAllConfigurations()) {
if (intersects(containerCfg.loaders, config.loaders)) {
Debug.logInfo("Loading container: " + containerCfg.name, module);
Container tmpContainer = loadContainer(containerCfg, ofbizCommands);

0 comments on commit 5a7b0e6

Please sign in to comment.
You can’t perform that action at this time.