Fix test failure
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/693a7de4 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/693a7de4 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/693a7de4 Branch: refs/heads/fb_tomee8 Commit: 693a7de4084f5c79f97e9adba57ea82e0defca4d Parents: d9f3ca8 Author: Jonathan Gallimore <j...@jrg.me.uk> Authored: Mon Jan 15 22:19:37 2018 +0000 Committer: Jonathan Gallimore <j...@jrg.me.uk> Committed: Mon Jan 15 22:19:37 2018 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/openejb/config/ConfigurationFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/693a7de4/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java index 8334912..0856e7e 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java @@ -292,7 +292,6 @@ public class ConfigurationFactory implements OpenEjbConfigurationFactory { chain.add(new CleanEnvEntries()); chain.add(new LinkBuiltInTypes()); - chain.add(new ActivationConfigPropertyOverride()); if (offline) { final AutoConfig autoConfig = new AutoConfig(this); @@ -303,6 +302,7 @@ public class ConfigurationFactory implements OpenEjbConfigurationFactory { chain.add(new AutoConfig(this)); } + chain.add(new ActivationConfigPropertyOverride()); chain.add(new ApplyOpenejbJar()); chain.add(new MappedNameBuilder()); chain.add(new OutputGeneratedDescriptors());
