Repository: wicket Updated Branches: refs/heads/WICKET-6129-scheduled-handler-notification e1d6ba425 -> 138ccca30
WICKET-6129 javadoc; cleanup and corrected spelling Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/138ccca3 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/138ccca3 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/138ccca3 Branch: refs/heads/WICKET-6129-scheduled-handler-notification Commit: 138ccca3023a5c01372cbe487f9be22d884b4461 Parents: e1d6ba4 Author: Sven Meier <[email protected]> Authored: Fri Apr 22 15:09:15 2016 +0200 Committer: Sven Meier <[email protected]> Committed: Fri Apr 22 15:09:15 2016 +0200 ---------------------------------------------------------------------- .../apache/wicket/request/cycle/RequestCycle.java | 15 +++++++++------ .../wicket/request/RequestHandlerExecutor.java | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/138ccca3/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java index 39104b9..ae069bb 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java @@ -266,7 +266,7 @@ public class RequestCycle implements IRequestCycle, IEventSink } /** - * Executes a request handler and fires pre/post listener methods + * Execute a request handler and notify registered {@link IRequestCycleListener}s. * * @param handler */ @@ -292,7 +292,7 @@ public class RequestCycle implements IRequestCycle, IEventSink throw e; } - if (replacer.isRemoveAll()) + if (replacer.getRemoveScheduled()) { requestHandlerExecutor.schedule(null); } @@ -327,13 +327,13 @@ public class RequestCycle implements IRequestCycle, IEventSink } catch (Exception e) { - if (retryCount <= 0) + if (retryCount > 0) { - log.error("Exception retry count exceeded", e); + executeExceptionRequestHandler(exception, retryCount - 1); } else { - executeExceptionRequestHandler(exception, retryCount - 1); + log.error("Exception retry count exceeded", e); } } } @@ -341,8 +341,11 @@ public class RequestCycle implements IRequestCycle, IEventSink /** * Return {@link IRequestHandler} for the given exception. * - * @param e + * @param e exception to handle * @return RequestHandler instance + * + * @see IRequestCycleListener#onException(RequestCycle, Exception) + * @see IExceptionMapper#map(Exception) */ protected IRequestHandler handleException(final Exception e) { http://git-wip-us.apache.org/repos/asf/wicket/blob/138ccca3/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerExecutor.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerExecutor.java b/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerExecutor.java index 4c0e5e5..8d41bd2 100644 --- a/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerExecutor.java +++ b/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerExecutor.java @@ -202,7 +202,7 @@ public abstract class RequestHandlerExecutor } /** - * @deprecated use {@link #getRemoveScheduledl()} instead + * @deprecated use {@link #getRemoveScheduled()} instead */ public boolean isRemoveAll() { @@ -212,7 +212,7 @@ public abstract class RequestHandlerExecutor /** * Should a scheduled handler be removed before replacing the handler */ - public boolean getRemoveScheduledl() + public boolean getRemoveScheduled() { return removeScheduled; }
