Use IConversationPropagation interface
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1e912b77 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1e912b77 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1e912b77 Branch: refs/heads/wicket-6.x Commit: 1e912b771a3512cc468c905edf45bb2f6c7b48a5 Parents: fbadd2b Author: Emond Papegaaij <[email protected]> Authored: Mon Nov 11 10:15:17 2013 +0100 Committer: Emond Papegaaij <[email protected]> Committed: Mon Nov 11 10:15:17 2013 +0100 ---------------------------------------------------------------------- .../java/org/apache/wicket/cdi/ConversationPropagator.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/1e912b77/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java index f76df2d..d9d4e1c 100644 --- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java +++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java @@ -374,7 +374,7 @@ public class ConversationPropagator extends AbstractRequestCycleListener page); } } - ConversationPropagation prop = annotation != null ? annotation.prop() : getPropagation(); + IConversationPropagation prop = annotation != null ? annotation.prop() : getPropagation(); // The conversationManager is attached to a conversation so update if (!getConversation().isTransient()) { @@ -490,16 +490,16 @@ public class ConversationPropagator extends AbstractRequestCycleListener return getConversationManager().getManageConversation(); } - ConversationPropagation getPropagation() + IConversationPropagation getPropagation() { if (getConversation().isTransient()) { logger.debug("Getting global Propagation {}.", cdiConfiguration.getPropagation()); - return (ConversationPropagation)cdiConfiguration.getPropagation(); + return cdiConfiguration.getPropagation(); } logger.debug("Propagation is set to {} with id = {}", getConversationManager() .getPropagation(), getConversation().getId()); - return (ConversationPropagation)getConversationManager().getPropagation(); + return getConversationManager().getPropagation(); } }
