Updated Branches: refs/heads/master 30e9e1023 -> 1931c6297
DELTASPIKE-488 cleanup Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/1931c629 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/1931c629 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/1931c629 Branch: refs/heads/master Commit: 1931c62976422c544c6faaa095f1a7fa4945be8d Parents: 30e9e10 Author: gpetracek <[email protected]> Authored: Mon Jan 6 12:58:00 2014 +0100 Committer: gpetracek <[email protected]> Committed: Mon Jan 6 12:58:00 2014 +0100 ---------------------------------------------------------------------- .../apache/deltaspike/core/impl/util/ConversationUtils.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/1931c629/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ConversationUtils.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ConversationUtils.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ConversationUtils.java index c24d538..d763d5d 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ConversationUtils.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ConversationUtils.java @@ -18,7 +18,6 @@ */ package org.apache.deltaspike.core.impl.util; -import org.apache.deltaspike.core.api.provider.BeanManagerProvider; import org.apache.deltaspike.core.api.scope.ConversationGroup; import org.apache.deltaspike.core.impl.scope.conversation.ConversationKey; @@ -37,19 +36,13 @@ public abstract class ConversationUtils { } - public static ConversationKey convertToConversationKey(Contextual<?> contextual) - { - return convertToConversationKey(contextual, BeanManagerProvider.getInstance().getBeanManager()); - } - public static ConversationKey convertToConversationKey(Contextual<?> contextual, BeanManager beanManager) { if (!(contextual instanceof Bean)) { if (contextual instanceof PassivationCapable) { - contextual = BeanManagerProvider.getInstance().getBeanManager() - .getPassivationCapableBean(((PassivationCapable) contextual).getId()); + contextual = beanManager.getPassivationCapableBean(((PassivationCapable) contextual).getId()); } else {
