fix conflicts
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2085f71c Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2085f71c Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2085f71c Branch: refs/heads/tomee-1.7.x Commit: 2085f71c1b08641319e0664b4e3c572e60d96705 Parents: 1989e74 Author: Ivan Junckes Filho <[email protected]> Authored: Fri Dec 15 10:29:14 2017 -0200 Committer: Thiago Veronezi <[email protected]> Committed: Wed Jan 17 12:57:53 2018 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/openejb/core/mdb/MdbContainer.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/2085f71c/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java index 14c065f..1b5548b 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java @@ -256,7 +256,6 @@ public class MdbContainer implements RpcContainer, BaseMdbContainer { objectRecipe.allow(Option.IGNORE_MISSING_PROPERTIES); objectRecipe.disallow(Option.FIELD_INJECTION); - final Map<String, String> activationProperties = beanContext.getActivationProperties(); for (final Map.Entry<String, String> entry : activationProperties.entrySet()) { objectRecipe.setMethodProperty(entry.getKey(), entry.getValue());
