Author: knopp
Date: Mon Apr  6 23:31:59 2009
New Revision: 762565

URL: http://svn.apache.org/viewvc?rev=762565&view=rev
Log: (empty)

Modified:
    
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/BufferedResponseEncoder.java
    
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java
    
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/request/Request.java

Modified: 
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/BufferedResponseEncoder.java
URL: 
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/BufferedResponseEncoder.java?rev=762565&r1=762564&r2=762565&view=diff
==============================================================================
--- 
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/BufferedResponseEncoder.java
 (original)
+++ 
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/BufferedResponseEncoder.java
 Mon Apr  6 23:31:59 2009
@@ -1,6 +1,7 @@
 package org.apache.wicket.request.encoder;
 
 import org.apache.wicket.RequestCycle;
+import org.apache.wicket.Session;
 import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.request.RequestHandler;
 import org.apache.wicket.request.RequestHandlerEncoder;
@@ -23,13 +24,20 @@
 
        protected String getSessionId()
        {
-               // TODO - get current session id
-               return "";
+               return Session.get().getId();
        }
 
        protected boolean hasBufferedResponse(Url url)
        {
-               return WebApplication.get().hasBufferedResponse(getSessionId(), 
url);
+               String sessionId = getSessionId();
+               if (sessionId != null)
+               {
+                       return 
WebApplication.get().hasBufferedResponse(sessionId, url);
+               }
+               else
+               {
+                       return false;
+               }               
        }
 
        protected BufferedWebResponse getAndRemoveBufferedResponse(Url url)

Modified: 
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java
URL: 
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java?rev=762565&r1=762564&r2=762565&view=diff
==============================================================================
--- 
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java
 (original)
+++ 
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java
 Mon Apr  6 23:31:59 2009
@@ -20,6 +20,7 @@
 import org.apache.wicket.IPage;
 import org.apache.wicket.PageParameters;
 import org.apache.wicket.RequestCycle;
+import org.apache.wicket.Session;
 import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.request.RequestHandler;
 import org.apache.wicket.request.Url;
@@ -142,14 +143,12 @@
 
        protected String getSessionId()
        {
-               // TODO - get current session id
-               return "";
+               return Session.get().getId();
        }
 
        protected boolean isSessionTemporary()
        {
-               // TODO - determine if current session is temporary
-               return true;
+               return Session.get().isTemporary();
        }
 
        protected BufferedWebResponse getAndRemoveBufferedResponse(Url url)

Modified: 
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/request/Request.java
URL: 
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/request/Request.java?rev=762565&r1=762564&r2=762565&view=diff
==============================================================================
--- 
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/request/Request.java
 (original)
+++ 
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/request/Request.java
 Mon Apr  6 23:31:59 2009
@@ -30,7 +30,7 @@
 public abstract class Request
 {
        /**
-        * Returns the URL for this request.
+        * Returns the URL for this request. URL is relative to Wicket filter 
path.
         * 
         * @return Url instance
         */


Reply via email to