You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2011/04/26 11:20:50 UTC
svn commit: r1096702 - in /wicket/trunk:
wicket-core/src/main/java/org/apache/wicket/protocol/http/DummyRequestLogger.java
wicket-request/src/main/java/org/apache/wicket/request/flow/ResetResponseException.java
Author: dashorst
Date: Tue Apr 26 09:20:50 2011
New Revision: 1096702
URL: http://svn.apache.org/viewvc?rev=1096702&view=rev
Log:
Fixes WICKET-3642
Issue: WICKET-3642
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/DummyRequestLogger.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/flow/ResetResponseException.java
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/DummyRequestLogger.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/DummyRequestLogger.java?rev=1096702&r1=1096701&r2=1096702&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/DummyRequestLogger.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/DummyRequestLogger.java Tue Apr 26 09:20:50 2011
@@ -29,6 +29,7 @@ import org.apache.wicket.MetaDataKey;
import org.apache.wicket.Page;
import org.apache.wicket.Session;
import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.IRequestHandlerDelegate;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.handler.BookmarkablePageRequestHandler;
import org.apache.wicket.request.handler.IPageRequestHandler;
@@ -194,6 +195,13 @@ public class DummyRequestLogger implemen
sb.append(resourceRefenceHandler.getResourceReference());
sb.append("]");
}
+ else if (requestHandler instanceof IRequestHandlerDelegate)
+ {
+ sb.append(requestHandler.getClass().getSimpleName())
+ .append(".")
+ .append(
+ getRequestHandlerString(((IRequestHandlerDelegate)requestHandler).getDelegateHandler()));
+ }
else
{
sb.append(requestHandler.toString());
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/flow/ResetResponseException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/flow/ResetResponseException.java?rev=1096702&r1=1096701&r2=1096702&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/flow/ResetResponseException.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/flow/ResetResponseException.java Tue Apr 26 09:20:50 2011
@@ -18,6 +18,7 @@ package org.apache.wicket.request.flow;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.IRequestHandlerDelegate;
import org.apache.wicket.request.RequestHandlerStack.ReplaceHandlerException;
/**
@@ -40,7 +41,10 @@ public abstract class ResetResponseExcep
super(new ResponseResettingDecorator(handler), true);
}
- private static class ResponseResettingDecorator implements IRequestHandler
+ private static class ResponseResettingDecorator
+ implements
+ IRequestHandler,
+ IRequestHandlerDelegate
{
private final IRequestHandler delegate;
@@ -64,5 +68,10 @@ public abstract class ResetResponseExcep
requestCycle.getResponse().reset();
delegate.respond(requestCycle);
}
+
+ public IRequestHandler getDelegateHandler()
+ {
+ return delegate;
+ }
}
}