You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2010/09/08 01:46:06 UTC
svn commit: r993559 -
/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java
Author: pete
Date: Tue Sep 7 23:46:06 2010
New Revision: 993559
URL: http://svn.apache.org/viewvc?rev=993559&view=rev
Log:
freeze / unfreeze of page id with resetting to previous state
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java?rev=993559&r1=993558&r2=993559&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java Tue Sep 7 23:46:06 2010
@@ -19,7 +19,6 @@ package org.apache.wicket.request.handle
import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.behavior.IBehavior;
-import org.apache.wicket.page.IManageablePage;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.request.component.IRequestablePage;
@@ -161,9 +160,11 @@ public class ListenerInterfaceRequestHan
* into the invoke method so we can access the request and figure out if it is ajax or
* not.
*/
- if (isAjax & page instanceof IManageablePage)
+ Boolean frozen = null;
+
+ if (isAjax)
{
- page.setFreezePageId(true);
+ frozen = page.setFreezePageId(true);
}
try
@@ -172,11 +173,8 @@ public class ListenerInterfaceRequestHan
}
finally
{
- if (isAjax && page instanceof IManageablePage)
- {
- page.setFreezePageId(false);
- }
-
+ if(frozen != null)
+ page.setFreezePageId(frozen);
}
}
else