Updated Branches:
  refs/heads/wicket-6.x 000cd8531 -> 59d04da2a

formatted

Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/11c5b62d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/11c5b62d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/11c5b62d

Branch: refs/heads/wicket-6.x
Commit: 11c5b62d54dc76bd2a0196ff3e460ffdb29cb8d8
Parents: 000cd85
Author: svenmeier <s...@meiers.net>
Authored: Thu Aug 8 11:52:46 2013 +0200
Committer: svenmeier <s...@meiers.net>
Committed: Thu Aug 8 11:52:46 2013 +0200

----------------------------------------------------------------------
 .../request/handler/render/WebPageRenderer.java | 25 +++++++++++---------
 1 file changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/11c5b62d/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 5dd15c4..f49a92b 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
@@ -107,7 +107,7 @@ public class WebPageRenderer extends PageRenderer
                }
 
                // keep the original response
-               final WebResponse originalResponse = (WebResponse) 
requestCycle.getResponse();
+               final WebResponse originalResponse = 
(WebResponse)requestCycle.getResponse();
 
                // buffered web response for page
                BufferedWebResponse response = new 
BufferedWebResponse(originalResponse);
@@ -123,10 +123,11 @@ public class WebPageRenderer extends PageRenderer
                        if (scheduled == null && 
requestCycle.getRequestHandlerScheduledAfterCurrent() != null)
                        {
                                // This is a special case.
-                               // During page render another request handler 
got scheduled and will want to overwrite
-                               // the response, so we need to let it.
-                               // Just preserve the meta data headers
-                               originalResponse.reset(); // clear the initial 
actions because they are already copied into the new response's actions
+                               // During page render another request handler 
got scheduled and will want to
+                               // overwrite the response, so we need to let it.
+                               // Just preserve the meta data headers. Clear 
the initial actions because they are
+                               // already copied into the new response's 
actions
+                               originalResponse.reset();
                                response.writeMetaData(originalResponse);
                                return null;
                        }
@@ -253,13 +254,15 @@ public class WebPageRenderer extends PageRenderer
                {
                        if (isRedirectToBuffer() == false && 
logger.isDebugEnabled())
                        {
-                               String details = String.format("redirect 
strategy: '%s', isAjax: '%s', redirect policy: '%s', " +
-                                               "current url: '%s', target url: 
'%s', is new: '%s', is stateless: '%s', is temporary: '%s'",
-                                               
Application.get().getRequestCycleSettings().getRenderStrategy(),
-                                               isAjax, getRedirectPolicy(), 
currentUrl, targetUrl, getPageProvider().isNewPageInstance(),
-                                               getPage().isPageStateless(), 
isSessionTemporary());
+                               String details = String.format(
+                                       "redirect strategy: '%s', isAjax: '%s', 
redirect policy: '%s', "
+                                               + "current url: '%s', target 
url: '%s', is new: '%s', is stateless: '%s', is temporary: '%s'",
+                                       
Application.get().getRequestCycleSettings().getRenderStrategy(), isAjax,
+                                       getRedirectPolicy(), currentUrl, 
targetUrl,
+                                       getPageProvider().isNewPageInstance(), 
getPage().isPageStateless(),
+                                       isSessionTemporary());
                                logger.debug("Falling back to 
Redirect_To_Buffer render strategy because none of the conditions " +
-                                               "matched. Details: " + details);
+                                       "matched. Details: " + details);
                        }
 
                        // force creation of possible stateful page to get the 
final target url

Reply via email to