From 69e93b4dbb675db109b464f2f0119b6b10b4f4cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=CC=81=20Bock?= Date: Fri, 10 Feb 2017 11:14:53 +0100 Subject: [PATCH 1/2] Fix for issue #811: remove current thread from _all_ traces --- .../statistics/ERXStatisticsStore.java | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java index c49fd44ad3b..1a20bf20f0d 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java @@ -133,17 +133,27 @@ protected void endTimer(WOContext aContext, String aString) { } Thread currentThread = Thread.currentThread(); - Map traces = _fatalTraces.remove(currentThread); - Map names = _fatalTracesNames.remove(currentThread); + + // get the most sever traces for the current thread + Map traces = _fatalTraces.get(currentThread); + Map names = _fatalTracesNames.get(currentThread); if (traces == null) { - traces = _errorTraces.remove(currentThread); - names = _errorTracesNames.remove(currentThread); + traces = _errorTraces.get(currentThread); + names = _errorTracesNames.get(currentThread); } if (traces == null) { - traces = _warnTraces.remove(currentThread); - names = _warnTracesNames.remove(currentThread); + traces = _warnTraces.get(currentThread); + names = _warnTracesNames.get(currentThread); } - + + // remove the current thread for _all_ traces + _fatalTraces.remove(currentThread); + _fatalTracesNames.remove(currentThread); + _errorTraces.remove(currentThread); + _errorTracesNames.remove(currentThread); + _warnTraces.remove(currentThread); + _warnTracesNames.remove(currentThread); + synchronized (_requestThreads) { _requestThreads.remove(Thread.currentThread()); } From 4e37a91c64f827b7ee30321c2aab6cb8a48b0f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=CC=81=20Bock?= Date: Fri, 10 Feb 2017 11:17:23 +0100 Subject: [PATCH 2/2] Fix spelling --- .../Sources/er/extensions/statistics/ERXStatisticsStore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java index 1a20bf20f0d..f4849485b50 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java @@ -134,7 +134,7 @@ protected void endTimer(WOContext aContext, String aString) { Thread currentThread = Thread.currentThread(); - // get the most sever traces for the current thread + // get the most severe trace for the current thread Map traces = _fatalTraces.get(currentThread); Map names = _fatalTracesNames.get(currentThread); if (traces == null) {