This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tracer.git
commit bca13fc620b7eaaa6c6218dd2bd946c5e5e0779b Author: Chetan Mehrotra <[email protected]> AuthorDate: Wed Feb 10 08:56:02 2016 +0000 SLING-5504 - Reduce memory footprint of stored recording data Clear the request attribute at the end git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1729552 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/java/org/apache/sling/tracer/internal/LogTracer.java | 2 +- src/main/java/org/apache/sling/tracer/internal/TraceLogRecorder.java | 4 ++-- src/main/java/org/apache/sling/tracer/internal/TracerLogServlet.java | 3 ++- .../java/org/apache/sling/tracer/internal/TracerLogServletTest.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/sling/tracer/internal/LogTracer.java b/src/main/java/org/apache/sling/tracer/internal/LogTracer.java index 2f6940b..17993f1 100644 --- a/src/main/java/org/apache/sling/tracer/internal/LogTracer.java +++ b/src/main/java/org/apache/sling/tracer/internal/LogTracer.java @@ -347,7 +347,7 @@ public class LogTracer { if (tracerContext != null) { disableCollector(); } - recorder.endRecording(recording); + recorder.endRecording(httpRequest, recording); } } diff --git a/src/main/java/org/apache/sling/tracer/internal/TraceLogRecorder.java b/src/main/java/org/apache/sling/tracer/internal/TraceLogRecorder.java index d00e617..6aeb313 100644 --- a/src/main/java/org/apache/sling/tracer/internal/TraceLogRecorder.java +++ b/src/main/java/org/apache/sling/tracer/internal/TraceLogRecorder.java @@ -35,7 +35,7 @@ interface TraceLogRecorder { } @Override - public void endRecording(Recording recording) { + public void endRecording(HttpServletRequest httpRequest, Recording recording) { } }; @@ -44,5 +44,5 @@ interface TraceLogRecorder { Recording getRecordingForRequest(HttpServletRequest request); - void endRecording(Recording recording); + void endRecording(HttpServletRequest httpRequest, Recording recording); } diff --git a/src/main/java/org/apache/sling/tracer/internal/TracerLogServlet.java b/src/main/java/org/apache/sling/tracer/internal/TracerLogServlet.java index 4eb028e..0a53631 100644 --- a/src/main/java/org/apache/sling/tracer/internal/TracerLogServlet.java +++ b/src/main/java/org/apache/sling/tracer/internal/TracerLogServlet.java @@ -227,12 +227,13 @@ class TracerLogServlet extends SimpleWebConsolePlugin implements TraceLogRecorde } @Override - public void endRecording(Recording recording) { + public void endRecording(HttpServletRequest httpRequest, Recording recording) { if (recording instanceof JSONRecording) { JSONRecording r = (JSONRecording) recording; r.done(); cache.put(r.getRequestId(), r); } + httpRequest.removeAttribute(ATTR_RECORDING); } Recording getRecording(String requestId) { diff --git a/src/test/java/org/apache/sling/tracer/internal/TracerLogServletTest.java b/src/test/java/org/apache/sling/tracer/internal/TracerLogServletTest.java index 5404380..61c1a9f 100644 --- a/src/test/java/org/apache/sling/tracer/internal/TracerLogServletTest.java +++ b/src/test/java/org/apache/sling/tracer/internal/TracerLogServletTest.java @@ -99,7 +99,7 @@ public class TracerLogServletTest { Recording recording = logServlet.startRecording(request, response); recording.registerTracker(createTracker("x" ,"y")); - logServlet.endRecording(recording); + logServlet.endRecording(request, recording); ArgumentCaptor<String> requestIdCaptor = ArgumentCaptor.forClass(String.class); verify(response).setHeader(eq(TracerLogServlet.HEADER_TRACER_REQUEST_ID), requestIdCaptor.capture()); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
