svn commit: r463259 - /incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/RequestCycle.java

[da...@apache.org]

Author: dashorst
Date: Thu Oct 12 07:26:24 2006
New Revision: 463259

URL: http://svn.apache.org/viewvc?view=rev&rev=463259
Log:
Fixed that exceptions during requestcycle detach cause uncomplete clean up by catching all exceptions

Modified:
    incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/RequestCycle.java

Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/RequestCycle.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/RequestCycle.java?view=diff&rev=463259&r1=463258&r2=463259
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/RequestCycle.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/RequestCycle.java Thu Oct 12 07:26:24 2006
@@ -814,7 +814,14 @@
 		}
 
 		// remove any rendered feedback messages from the session
-		session.cleanupFeedbackMessages();
+		try
+		{
+			session.cleanupFeedbackMessages();
+		}
+		catch(RuntimeException re)
+		{
+			log.error("there was an error cleaning up the feedback messages", re);
+		}
 		
 		if (updateSession)
 		{
@@ -833,8 +840,14 @@
 		// clear the used pagemap for this thread, 
 		// maybe we can move this a few lines above to have a but more
 		// concurrency (session.update)
-		session.requestDetached();
-		
+		try
+		{
+			session.requestDetached();
+		}
+		catch(RuntimeException re)
+		{
+			log.error("there was an error detaching the request from the session " + session + ".", re);
+		}
 		if (getResponse() instanceof BufferedWebResponse)
 		{
 			try
@@ -863,7 +876,14 @@
 		}
 
 		// Release thread local resources
-		threadDetach();
+		try
+		{
+			threadDetach();
+		}
+		catch(RuntimeException re)
+		{
+			log.error("Exception occurred during threadDetach", re);
+		}
 	}
 
 	/**