Repository: deltaspike Updated Branches: refs/heads/master 0eb8df7f1 -> 8b339706d
DELTASPIKE-994 fixed cleanup in MessageBundleLifecycle (in case the DependentProvider wasn't used) Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/8b339706 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/8b339706 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/8b339706 Branch: refs/heads/master Commit: 8b339706d517bae8fb8b90e93761b95af8e164a5 Parents: 0eb8df7 Author: gpetracek <[email protected]> Authored: Tue Oct 6 20:54:42 2015 +0200 Committer: gpetracek <[email protected]> Committed: Tue Oct 6 20:56:43 2015 +0200 ---------------------------------------------------------------------- .../deltaspike/core/impl/message/MessageBundleExtension.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8b339706/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java index e538ddd..5636529 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java @@ -185,7 +185,10 @@ public class MessageBundleExtension implements Extension, Deactivatable @Override public void destroy(Bean<T> bean, T instance, CreationalContext<T> creationalContext) { - invocationHandlerProvider.destroy(); + if (invocationHandlerProvider != null) + { + invocationHandlerProvider.destroy(); + } } private <T> T createMessageBundleProxy(Class<T> type, MessageBundleInvocationHandler handler)
