You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2009/05/04 01:40:48 UTC
svn commit: r771149 -
/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java
Author: ivaynberg
Date: Sun May 3 23:40:48 2009
New Revision: 771149
URL: http://svn.apache.org/viewvc?rev=771149&view=rev
Log:
WICKET-2251 LoadableDeatachableModel onDetach() invoked after nulling the model
Issue: WICKET-2251
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java?rev=771149&r1=771148&r2=771149&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java Sun May 3 23:40:48 2009
@@ -95,15 +95,21 @@
{
if (attached)
{
- attached = false;
- transientModelObject = null;
-
- if (log.isDebugEnabled())
+ try
{
- log.debug("removed transient object for " + this + ", requestCycle " +
- RequestCycle.get());
+ onDetach();
+ }
+ finally
+ {
+ attached = false;
+ transientModelObject = null;
+
+ if (log.isDebugEnabled())
+ {
+ log.debug("removed transient object for " + this + ", requestCycle " +
+ RequestCycle.get());
+ }
}
- onDetach();
}
}