Repository: wicket Updated Branches: refs/heads/master ed64e166d -> cade75e5a
Don't lookup twice the active request handler. Add '' around the logged data for easier reading Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1495f33b Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1495f33b Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1495f33b Branch: refs/heads/master Commit: 1495f33b1c77b3d978270bc156d3b25a617fa4ef Parents: ed64e16 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Feb 19 12:21:13 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Feb 19 12:21:13 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/cdi/AutoConversationManager.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/1495f33b/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/AutoConversationManager.java ---------------------------------------------------------------------- diff --git a/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/AutoConversationManager.java b/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/AutoConversationManager.java index 5b88365..4aedb48 100644 --- a/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/AutoConversationManager.java +++ b/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/AutoConversationManager.java @@ -60,8 +60,9 @@ public class AutoConversationManager implements IComponentOnBeforeRenderListener if (component instanceof Page) { Page page = (Page)component; - autoEndIfNecessary(page, RequestCycle.get().getActiveRequestHandler()); - autoBeginIfNecessary(page, RequestCycle.get().getActiveRequestHandler()); + IRequestHandler activeRequestHandler = page.getRequestCycle().getActiveRequestHandler(); + autoEndIfNecessary(page, activeRequestHandler); + autoBeginIfNecessary(page, activeRequestHandler); } } @@ -78,7 +79,7 @@ public class AutoConversationManager implements IComponentOnBeforeRenderListener conversation.begin(); autoConversation.setAutomatic(true); - logger.debug("Auto-began conversation {} for page {}", conversation.getId(), page); + logger.debug("Auto-began conversation '{}' for page '{}'", conversation.getId(), page); } protected void autoEndIfNecessary(Page page, IRequestHandler handler) @@ -98,7 +99,7 @@ public class AutoConversationManager implements IComponentOnBeforeRenderListener conversation.end(); ConversationPropagator.removeConversationIdFromPage(page); - logger.debug("Auto-ended conversation {} for page {}", cid, page); + logger.debug("Auto-ended conversation '{}' for page '{}'", cid, page); } protected boolean hasConversationalComponent(Page page)
