You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2007/04/13 16:38:07 UTC
svn commit: r528502 - in
/incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket: ./
src/main/java/wicket/ src/main/java/wicket/request/target/component/
src/main/java/wicket/request/target/component/listener/
Author: dashorst
Date: Fri Apr 13 07:38:06 2007
New Revision: 528502
URL: http://svn.apache.org/viewvc?view=rev&rev=528502
Log:
Hopefully fixed cross session page stuff
Modified:
incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/pom.xml
incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/RequestCycle.java
incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/request/target/component/BookmarkablePageRequestTarget.java
incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/request/target/component/PageRequestTarget.java
incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/request/target/component/listener/AbstractListenerInterfaceRequestTarget.java
Modified: incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/pom.xml?view=diff&rev=528502&r1=528501&r2=528502
==============================================================================
--- incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/pom.xml (original)
+++ incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/pom.xml Fri Apr 13 07:38:06 2007
@@ -28,7 +28,7 @@
</parent>
<artifactId>wicket</artifactId>
- <version>1.3-20061204-fix5</version>
+ <version>1.3-20061204-fix6</version>
<packaging>jar</packaging>
<name>Wicket</name>
<url>http://wicketframework.org/${project.artifactId}-1.3</url>
Modified: incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/RequestCycle.java
URL: http://svn.apache.org/viewvc/incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/RequestCycle.java?view=diff&rev=528502&r1=528501&r2=528502
==============================================================================
--- incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/RequestCycle.java (original)
+++ incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/RequestCycle.java Fri Apr 13 07:38:06 2007
@@ -245,9 +245,6 @@
/** the time that this request cycle object was created. */
private final long startTime = System.currentTimeMillis();
- /** True if the session should be updated (for clusterf purposes). */
- private boolean updateSession;
-
/**
* Constructor.
*
@@ -412,9 +409,9 @@
/**
* Template method that is called when a runtime exception is thrown, just
* before the actual handling of the runtime exception. This is called by
- * {@link wicket.request.compound.DefaultExceptionResponseStrategy}, hence
- * if that strategy is replaced by another one, there is no guarantee this
- * method is called.
+ * {@link org.apache.wicket.request.compound.DefaultExceptionResponseStrategy},
+ * hence if that strategy is replaced by another one, there is no guarantee
+ * this method is called.
*
* @param page
* Any page context where the exception was thrown
@@ -617,17 +614,6 @@
}
/**
- * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT.
- *
- * @param updateCluster
- * The updateCluster to set.
- */
- public void setUpdateSession(boolean updateCluster)
- {
- this.updateSession = updateCluster;
- }
-
- /**
* @see java.lang.Object#toString()
*/
public String toString()
@@ -831,28 +817,31 @@
}
}
- // remove any rendered feedback messages from the session
+ // remove any rendered and otherwise obsolute feedback messages from the
+ // session
try
{
session.cleanupFeedbackMessages();
+// Page page = getResponsePage();
+// if (page != null)
+// {
+// session.cleanupFeedbackMessages(page);
+// }
}
catch (RuntimeException re)
{
log.error("there was an error cleaning up the feedback messages", re);
}
- if (updateSession)
+ // At the end of our response, we need to set any session
+ // attributes that might be required to update the cluster
+ try
{
- // At the end of our response, we need to set any session
- // attributes that might be required to update the cluster
- try
- {
- session.update();
- }
- catch (RuntimeException re)
- {
- log.error("there was an error updating the session " + session + ".", re);
- }
+ session.update();
+ }
+ catch (RuntimeException re)
+ {
+ log.error("there was an error updating the session " + session + ".", re);
}
try
Modified: incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/request/target/component/BookmarkablePageRequestTarget.java
URL: http://svn.apache.org/viewvc/incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/request/target/component/BookmarkablePageRequestTarget.java?view=diff&rev=528502&r1=528501&r2=528502
==============================================================================
--- incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/request/target/component/BookmarkablePageRequestTarget.java (original)
+++ incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/request/target/component/BookmarkablePageRequestTarget.java Fri Apr 13 07:38:06 2007
@@ -201,7 +201,6 @@
{
if (!requestCycle.getRedirect())
{
- requestCycle.setUpdateSession(true);
page = getPage(requestCycle);
}
}
Modified: incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/request/target/component/PageRequestTarget.java
URL: http://svn.apache.org/viewvc/incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/request/target/component/PageRequestTarget.java?view=diff&rev=528502&r1=528501&r2=528502
==============================================================================
--- incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/request/target/component/PageRequestTarget.java (original)
+++ incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/request/target/component/PageRequestTarget.java Fri Apr 13 07:38:06 2007
@@ -61,8 +61,6 @@
}
else
{
- requestCycle.setUpdateSession(true);
-
// Let page render itself
page.renderPage();
}
Modified: incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/request/target/component/listener/AbstractListenerInterfaceRequestTarget.java
URL: http://svn.apache.org/viewvc/incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/request/target/component/listener/AbstractListenerInterfaceRequestTarget.java?view=diff&rev=528502&r1=528501&r2=528502
==============================================================================
--- incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/request/target/component/listener/AbstractListenerInterfaceRequestTarget.java (original)
+++ incubator/wicket/sandbox/dashorst/wicket-1.3-20061204-patched/wicket/src/main/java/wicket/request/target/component/listener/AbstractListenerInterfaceRequestTarget.java Fri Apr 13 07:38:06 2007
@@ -108,13 +108,6 @@
*/
protected void onProcessEvents(final RequestCycle requestCycle)
{
- // Assume cluster needs to be updated now, unless listener
- // invocation changes this
- requestCycle.setUpdateSession(true);
-
- // Clear all feedback messages if it isn't a redirect
- getPage().getFeedbackMessages().clear();
-
getPage().startComponentRender(getTarget());
final Application application = requestCycle.getApplication();