You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2007/09/01 08:55:10 UTC

svn commit: r571723 - in /wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket: RequestCycle.java protocol/http/WebRequestCycle.java

Author: jdonnerstag
Date: Fri Aug 31 23:55:09 2007
New Revision: 571723

URL: http://svn.apache.org/viewvc?rev=571723&view=rev
Log:
stupid change I did. Reverted it.

Modified:
    wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
    wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java?rev=571723&r1=571722&r2=571723&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java Fri Aug 31 23:55:09 2007
@@ -1118,7 +1118,10 @@
 				// probably our last chance the exception can be logged.
 				// Note that a PageExpiredException should not be logged, because
 				// it's not an internal error
-				onRuntimeException(e);
+				if (e instanceof PageExpiredException)
+				{
+					logRuntimeException(e);
+				}
 
 				// try to play nicely and let the request processor handle the
 				// exception response. If that doesn't work, any runtime exception
@@ -1135,22 +1138,6 @@
 						"unexpected exception when handling another exception: " + e.getMessage(),
 						e);
 			}
-		}
-	}
-
-	/**
-	 * Called when an unrecoverable runtime exception during request cycle handling occured, which
-	 * will result in displaying a user facing error page. Clients can override this method in case
-	 * they want to customize logging.
-	 * 
-	 * @param e
-	 *            the runtime exception
-	 */
-	protected void onRuntimeException(RuntimeException e)
-	{
-		if (!(e instanceof PageExpiredException))
-		{
-			logRuntimeException(e);
 		}
 	}
 

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java?rev=571723&r1=571722&r2=571723&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java Fri Aug 31 23:55:09 2007
@@ -212,7 +212,10 @@
 					throw ex;
 				}
 
-				onRuntimeException(ex);
+				if (ex instanceof PageExpiredException)
+				{
+					logRuntimeException(ex);
+				}
 
 				IRequestCycleProcessor processor = getProcessor();
 				processor.respond(ex, this);