Merge remote-tracking branch 'apache/tomee-1.7.x' into resource-pre-destroy-17x
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/08219143 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/08219143 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/08219143 Branch: refs/heads/tomee-1.7.x Commit: 0821914388dfaf880c74ccc021b1dec57a7a5a75 Parents: 463e32d 823e5dd Author: Jonathan Gallimore <[email protected]> Authored: Thu Aug 3 00:09:05 2017 +0100 Committer: Jonathan Gallimore <[email protected]> Committed: Thu Aug 3 00:09:05 2017 +0100 ---------------------------------------------------------------------- .../ActivationConfigPropertyOverride.java | 2 +- .../apache/openejb/core/mdb/MdbContainer.java | 21 ++- .../core/mdb/ResourceAdapterControlTest.java | 16 +- .../mdb/ResourceAdapterDeliveryActiveTest.java | 184 +++++++++++++++++++ 4 files changed, 213 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
