fixes override configuration
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1909894a Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1909894a Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1909894a Branch: refs/heads/master Commit: 1909894a486d12483b47b4867f7bcd7461105b5d Parents: 7fcd0ee Author: Otavio Santana <[email protected]> Authored: Wed Jul 12 11:49:26 2017 -0300 Committer: Otavio Santana <[email protected]> Committed: Wed Jul 12 11:49:26 2017 -0300 ---------------------------------------------------------------------- .../openejb/config/ActivationConfigPropertyOverride.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/1909894a/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java index 7411183..86f36b9 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java @@ -99,7 +99,7 @@ public class ActivationConfigPropertyOverride implements DynamicDeployer { overrides.putAll(ConfigurationFactory.getOverrides(mdbContainer.getProperties(), "activation", "EnterpriseBean")); } - + overrides.putAll(ConfigurationFactory.getOverrides(properties, "mdb.activation", "EnterpriseBean")); overrides.putAll(ConfigurationFactory.getOverrides(properties, mdb.getMessagingType() + ".activation", "EnterpriseBean")); overrides.putAll(ConfigurationFactory.getOverrides(properties, ejbName + ".activation", "EnterpriseBean")); overrides.putAll(ConfigurationFactory.getOverrides(properties, ejbDeployment.getDeploymentId() + ".activation", "EnterpriseBean")); @@ -146,6 +146,10 @@ public class ActivationConfigPropertyOverride implements DynamicDeployer { final ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class); + if (containerSystem == null) { + return null; + } + if (containerId == null || containerId.length() == 0) { final Container[] containers = containerSystem.containers(); for (Container container : containers) {
