Fixes for override tests (cherry picked from commit fbe9d89d0d2a97881c8f35af8803f16c5c530f35)
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0afaaba6 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0afaaba6 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0afaaba6 Branch: refs/heads/tomee-1.7.x Commit: 0afaaba6eb797ef2feddbbca61b4fd13c35ef0ef Parents: aeef512 Author: Jonathan Gallimore <[email protected]> Authored: Fri Jan 5 11:38:31 2018 +0000 Committer: Thiago Veronezi <[email protected]> Committed: Wed Jan 17 13:13:31 2018 -0500 ---------------------------------------------------------------------- .../openejb/core/mdb/MdbContainerFactory.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/0afaaba6/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainerFactory.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainerFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainerFactory.java index 3298028..86b6ce9 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainerFactory.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainerFactory.java @@ -21,6 +21,7 @@ import org.apache.openejb.util.Duration; import org.apache.openejb.util.Pool; import javax.resource.spi.ResourceAdapter; +import java.util.Properties; public class MdbContainerFactory { @@ -39,6 +40,8 @@ public class MdbContainerFactory { private boolean useOneSchedulerThreadByBean = false; private int evictionThreads = 1; private boolean pool; + private Properties properties = new Properties(); + public Object getId() { @@ -198,17 +201,27 @@ public class MdbContainerFactory { this.pool = pool; } + public Properties getProperties() { + return properties; + } + public BaseMdbContainer create() { if (pool) { - return new MdbPoolContainer(id, securityService, resourceAdapter, + final MdbPoolContainer mdbPoolContainer = new MdbPoolContainer(id, securityService, resourceAdapter, messageListenerInterface, activationSpecClass, failOnUnknownActivationSpec, accessTimeout, closeTimeout, poolBuilder, callbackThreads, useOneSchedulerThreadByBean, evictionThreads); + + mdbPoolContainer.getProperties().putAll(this.getProperties()); + return mdbPoolContainer; } else { - return new MdbContainer(id, securityService, resourceAdapter, + final MdbContainer mdbContainer = new MdbContainer(id, securityService, resourceAdapter, messageListenerInterface, activationSpecClass, instanceLimit, failOnUnknownActivationSpec); + + mdbContainer.getProperties().putAll(this.getProperties()); + return mdbContainer; } } }
