Hi Andrea,

On Jul 26, 2014 12:06 AM, <[email protected]> wrote:
>
> Repository: wicket
> Updated Branches:
>   refs/heads/wicket-6.x 8e24bfbd4 -> 6b8439f93
>
>
> WICKET-5643 storeBufferedResponse should check if session is temporary.
>
> Code changed as suggested by Martin
>
>
> Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
> Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1064d372
> Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1064d372
> Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1064d372
>
> Branch: refs/heads/wicket-6.x
> Commit: 1064d372b48a048bdee292564ec5f45cd00fd3c4
> Parents: 8e24bfb
> Author: andrea del bene <[email protected]>
> Authored: Thu Jul 17 20:22:35 2014 +0200
> Committer: Andrea Del Bene <[email protected]>
> Committed: Fri Jul 25 22:59:24 2014 +0200
>
> ----------------------------------------------------------------------
>  .../org/apache/wicket/protocol/http/WebApplication.java     | 9 +--------
>  .../wicket/request/handler/render/WebPageRenderer.java      | 8 ++++----
>  2 files changed, 5 insertions(+), 12 deletions(-)
> ----------------------------------------------------------------------
>
>
>
http://git-wip-us.apache.org/repos/asf/wicket/blob/1064d372/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
> ----------------------------------------------------------------------
> diff --git
a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
> index 0ce3ef4..54bb265 100644
> ---
a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
> +++
b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
> @@ -893,14 +893,7 @@ public abstract class WebApplication extends
Application
>          * @param response
>          */
>         public void storeBufferedResponse(String sessionId, Url url,
BufferedWebResponse response)
> -       {
> -               if (Strings.isEmpty(sessionId))
> -               {
> -                       log.error("storeBufferedResponse needs a valid
session id to store the response, but a null one was found. "
> -                                       + "Please report the problem to
dev team and try to reproduce it in a quickstart project.");
> -                       return;
> -               }

You reverted what I believe was the best solution here.
Please review the previous commits to this ticket.

> -
> +       {
>                 String key = sessionId + url.toString();
>                 storedResponses.put(key, response);
>         }
>
>
http://git-wip-us.apache.org/repos/asf/wicket/blob/1064d372/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
> ----------------------------------------------------------------------
> diff --git
a/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
b/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
> index 032546f..3376177 100644
> ---
a/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
> +++
b/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
> @@ -73,17 +73,17 @@ public class WebPageRenderer extends PageRenderer
>         /**
>          * Store the buffered response at application level. If current
session is
>          * temporary, a permanent one is created.
> -        *
> +        *
>          * @param url
>          * @param response
>          */
>         protected void storeBufferedResponse(Url url, BufferedWebResponse
response)
> -       {
> -               if (isSessionTemporary())
> +       {
> +               if (isSessionTemporary())
>                 {
>                         Session.get().bind();
>                 }
> -
> +
>
WebApplication.get().storeBufferedResponse(getSessionId(), url, response);
>         }
>
>

Reply via email to