You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2012/04/19 11:09:31 UTC
[13/22] git commit: WICKET-4500 InterceptData never cleared from
session after continueToOriginalDestination is called
WICKET-4500 InterceptData never cleared from session after continueToOriginalDestination is called
Create a new Session if needed when looking for InterceptData
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7a86fe36
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7a86fe36
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7a86fe36
Branch: refs/heads/sandbox/atmosphere
Commit: 7a86fe364de1bcfbbf7017c4303c5e37d2aff3c0
Parents: 2ab126e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Apr 17 16:26:40 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Apr 17 16:28:40 2012 +0300
----------------------------------------------------------------------
.../RestartResponseAtInterceptPageException.java | 9 +--------
.../request/mapper/CompoundRequestMapper.java | 3 ++-
2 files changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/7a86fe36/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java b/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
index 1fbd4b6..df34dcc 100644
--- a/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
+++ b/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
@@ -143,14 +143,7 @@ public class RestartResponseAtInterceptPageException extends ResetResponseExcept
public static InterceptData get()
{
- if (Session.exists())
- {
- return Session.get().getMetaData(key);
- }
- else
- {
- return null;
- }
+ return Session.get().getMetaData(key);
}
public static void clear()
http://git-wip-us.apache.org/repos/asf/wicket/blob/7a86fe36/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
index 58e4423..6dd68ff 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
@@ -139,7 +139,8 @@ public class CompoundRequestMapper implements ICompoundRequestMapper
for (MapperWithScore mapperWithScore : list)
{
- IRequestHandler handler = mapperWithScore.getMapper().mapRequest(request);
+ IRequestMapper mapper = mapperWithScore.getMapper();
+ IRequestHandler handler = mapper.mapRequest(request);
if (handler != null)
{
return handler;