Author: jcompagner
Date: Tue Aug 26 01:44:18 2008
New Revision: 688996

URL: http://svn.apache.org/viewvc?rev=688996&view=rev
Log:
extra exception checks so that afteRender (and the RENDERING flag) is set to 
false when an exceptions happens at the prepareForRender or headercontrib stage

Modified:
    
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java

Modified: 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java?rev=688996&r1=688995&r2=688996&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
 (original)
+++ 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
 Tue Aug 26 01:44:18 2008
@@ -744,10 +744,25 @@
 
                page.startComponentRender(component);
 
-               component.prepareForRender();
+               try
+               {
+                       component.prepareForRender();
 
-               // render any associated headers of the component
-               respondHeaderContribution(response, component);
+                       // render any associated headers of the component
+                       respondHeaderContribution(response, component);
+               }
+               catch (RuntimeException e)
+               {
+                       try
+                       {
+                               component.afterRender();
+                       }
+                       catch (RuntimeException e2)
+                       {
+                               // ignore this one could be a result off.
+                       }
+                       throw e;
+               }
 
                component.renderComponent();
 


Reply via email to