svn commit: r1045317 - in /wicket/trunk/wicket/src/main/java/org/apache/wicket: page/IManageablePage.java request/handler/render/WebPageRenderer.java request/mapper/BufferedResponseMapper.java

[mgrigorov]

Author: mgrigorov
Date: Mon Dec 13 19:13:31 2010
New Revision: 1045317

URL: http://svn.apache.org/viewvc?rev=1045317&view=rev
Log:
WICKET-3239 for stateless pages wicket complains with "The Buffered response 
should be handled by BufferedResponseRequestHandler"

Don't redirect (to render|buffer) for stateless pages.

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/page/IManageablePage.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BufferedResponseMapper.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/page/IManageablePage.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/page/IManageablePage.java?rev=1045317&r1=1045316&r2=1045317&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/page/IManageablePage.java 
(original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/page/IManageablePage.java 
Mon Dec 13 19:13:31 2010
@@ -22,11 +22,6 @@ import org.apache.wicket.IClusterable;
 public interface IManageablePage extends IClusterable
 {
        /**
-        * A prefix used as session id replacement for stored responses for 
stateless pages
-        */
-       String STATELESS_SESSION_ID = "stateless-";
-
-       /**
         * Gets whether the page is stateless. Components on stateless page 
must not render any stateful
         * urls. Stateful urls are urls, which refer to a certain (current) 
page instance and don't
         * contain enough information to reconstruct page if it's not available 
(page class).

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java?rev=1045317&r1=1045316&r2=1045317&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
 Mon Dec 13 19:13:31 2010
@@ -18,7 +18,6 @@ package org.apache.wicket.request.handle
 
 import org.apache.wicket.Application;
 import org.apache.wicket.Session;
-import org.apache.wicket.page.IManageablePage;
 import org.apache.wicket.protocol.http.BufferedWebResponse;
 import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.request.IRequestHandler;
@@ -80,14 +79,12 @@ public class WebPageRenderer extends Pag
                getPage().renderPage();
        }
 
+       /**
+        * @return the current session id for stateful pages and 
<code>null</code> for stateless pages
+        */
        private String getSessionId()
        {
-               String sessionId = Session.get().getId();
-               if (sessionId == null)
-               {
-                       sessionId = IManageablePage.STATELESS_SESSION_ID;
-               }
-               return sessionId;
+               return Session.get().getId();
        }
 
        private boolean isSessionTemporary()
@@ -290,6 +287,6 @@ public class WebPageRenderer extends Pag
         */
        protected boolean enableRedirectForStatelessPage()
        {
-               return true;
+               return false;
        }
 }

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BufferedResponseMapper.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BufferedResponseMapper.java?rev=1045317&r1=1045316&r2=1045317&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BufferedResponseMapper.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BufferedResponseMapper.java
 Mon Dec 13 19:13:31 2010
@@ -17,7 +17,6 @@
 package org.apache.wicket.request.mapper;
 
 import org.apache.wicket.Session;
-import org.apache.wicket.page.IManageablePage;
 import org.apache.wicket.protocol.http.BufferedWebResponse;
 import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.request.IRequestHandler;
@@ -42,17 +41,11 @@ public class BufferedResponseMapper impl
        }
 
        /**
-        * 
-        * @return session id
+        * @return the current session id for stateful pages and 
<code>null</code> for stateless pages
         */
        protected String getSessionId()
        {
-               String sessionId = Session.get().getId();
-               if (sessionId == null)
-               {
-                       sessionId = IManageablePage.STATELESS_SESSION_ID;
-               }
-               return sessionId;
+               return Session.get().getId();
        }