svn commit: r992874 - in /wicket/trunk: wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java

[pete]

Author: pete
Date: Sun Sep  5 19:31:42 2010
New Revision: 992874

URL: http://svn.apache.org/viewvc?rev=992874&view=rev
Log:
WICKET-3031

Modified:
    
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java

Modified: 
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java?rev=992874&r1=992873&r2=992874&view=diff
==============================================================================
--- 
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
 (original)
+++ 
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
 Sun Sep  5 19:31:42 2010
@@ -95,7 +95,7 @@ public abstract class RequestHandlerStac
 
                        if (replacer.removeAll && !first)
                        {
-                               throw (RuntimeException)exception;
+                               throw exception;
                        }
                        replacementHandler = replacer.replacementRequestHandler;
                }
@@ -203,7 +203,7 @@ public abstract class RequestHandlerStac
 
        /**
         * Replaces current {...@link Response} with new {...@link Response} 
instance. The original response
-        * is always restored after the {...@link 
IRequestHandler#respond(RequestCycle)} method is
+        * is always restored after the {...@link 
IRequestHandler#respond(IRequestCycle)} method is
         * finished.
         * 
         * @param response
@@ -277,5 +277,5 @@ public abstract class RequestHandlerStac
                        // don't do anything here
                        return null;
                }
-       };
+       }
 }

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java?rev=992874&r1=992873&r2=992874&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
 Sun Sep  5 19:31:42 2010
@@ -84,7 +84,7 @@ public class RequestCycle extends Reques
                 * @param requestCycle
                 */
                public void onDetach(RequestCycle requestCycle);
-       };
+       }
 
        /**
         * Returns request cycle associated with current thread.
@@ -271,6 +271,8 @@ public class RequestCycle extends Reques
         */
        private void executeExceptionRequestHandler(final IRequestHandler 
handler, final int retryCount)
        {
+               scheduleRequestHandlerAfterCurrent(null);
+
                try
                {
                        executeRequestHandler(handler);
@@ -401,8 +403,6 @@ public class RequestCycle extends Reques
         * 
         * @param <C>
         * 
-        * @see RequestCycle#urlFor(IPageMap, Class, PageParameters)
-        * 
         * @param pageClass
         *            Class of page
         * @param parameters
@@ -438,8 +438,6 @@ public class RequestCycle extends Reques
         * 
         * @param <C>
         * 
-        * @see RequestCycle#urlFor(IPageMap, Class, PageParameters)
-        * 
         * @param pageClass
         *            Class of page
         * @param parameters
@@ -510,7 +508,6 @@ public class RequestCycle extends Reques
                                {
                                        log.error("Error detaching 
DetachCallback", e);
                                }
-                               ;
                        }
                        set(null);
                }