You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/06/24 15:24:51 UTC
[1/2] git commit: WICKET-5241 RequestLogger's server duration does
not include 'detach duration'
Repository: wicket
Updated Branches:
refs/heads/master d0c57a9ee -> fc34fb6c6
WICKET-5241 RequestLogger's server duration does not include 'detach duration'
Track the request logger's end time after all pages have been detached.
This way it shows the correct time fo the page rendering.
(cherry picked from commit 1d9ef1107958deb83f9f87a9e8be80d48b267ecf)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/763127d5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/763127d5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/763127d5
Branch: refs/heads/master
Commit: 763127d5e9f6b4ddae4fd04c68e37b6222f8318d
Parents: d0c57a9
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Mar 14 11:11:39 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jun 24 16:21:47 2014 +0300
----------------------------------------------------------------------
wicket-core/src/main/java/org/apache/wicket/Application.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/763127d5/wicket-core/src/main/java/org/apache/wicket/Application.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application.java b/wicket-core/src/main/java/org/apache/wicket/Application.java
index bb57878..4c61bb5 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Application.java
@@ -1647,17 +1647,13 @@ public abstract class Application implements UnboundListener, IEventSink
{
Session.get().getPageManager().commitRequest();
}
- }
- @Override
- public void onEndRequest(RequestCycle cycle)
- {
if (Application.exists())
{
IRequestLogger requestLogger = Application.get().getRequestLogger();
if (requestLogger != null)
{
- requestLogger.requestTime((System.currentTimeMillis() - cycle.getStartTime()));
+ requestLogger.requestTime((System.currentTimeMillis() - requestCycle.getStartTime()));
}
}
}
[2/2] git commit: WICKET-5241 RequestLogger's server duration does
not include 'detach duration'
Posted by mg...@apache.org.
WICKET-5241 RequestLogger's server duration does not include 'detach duration'
Remove detaching of the pages in RequestAdapter#commitRequest().
The page has been detached few calls ago:
In org.apache.wicket.request.cycle.RequestCycle#onDetach:
try
{
requestHandlerExecutor.detach(); // detaches pages #1
}
finally
{
listeners.onDetach(this); // detaches pages #2 (no more)
}
(cherry picked from commit 48eaae68fe0327b421cb2ffb56912cd180bf6728)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fc34fb6c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fc34fb6c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fc34fb6c
Branch: refs/heads/master
Commit: fc34fb6c6ea235b5b9f41ef278cd134ea781e242
Parents: 763127d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Mar 14 11:28:56 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jun 24 16:21:59 2014 +0300
----------------------------------------------------------------------
.../main/java/org/apache/wicket/page/RequestAdapter.java | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/fc34fb6c/wicket-core/src/main/java/org/apache/wicket/page/RequestAdapter.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/page/RequestAdapter.java b/wicket-core/src/main/java/org/apache/wicket/page/RequestAdapter.java
index 23b1d30..01f1392 100644
--- a/wicket-core/src/main/java/org/apache/wicket/page/RequestAdapter.java
+++ b/wicket-core/src/main/java/org/apache/wicket/page/RequestAdapter.java
@@ -151,15 +151,6 @@ public abstract class RequestAdapter
touchedPages.size());
for (IManageablePage page : touchedPages)
{
- try
- {
- page.detach();
- }
- catch (Exception e)
- {
- log.error("Error detaching page", e);
- }
-
boolean isPageStateless;
try
{
@@ -182,4 +173,4 @@ public abstract class RequestAdapter
}
}
}
-}
\ No newline at end of file
+}