diff options
| author | tschoening <tschoening@13f79535-47bb-0310-9956-ffa450edef68> | 2014-02-10 14:52:33 +0000 |
|---|---|---|
| committer | tschoening <tschoening@13f79535-47bb-0310-9956-ffa450edef68> | 2014-02-10 14:52:33 +0000 |
| commit | 828057e1a995ab4c581731fcbe6b6a0179c0fbe4 (patch) | |
| tree | 0a9706f960eb2f3199b8da6b6ab7dae075edddbd | |
| parent | 33bcb5071a0d828490804e708bcdc221d2464472 (diff) | |
| download | log4cxx-828057e1a995ab4c581731fcbe6b6a0179c0fbe4.tar.gz | |
LOGCXX-339: Child thread does not inherit a copy of the mapped diagnostic context of its parent
git-svn-id: http://svn.apache.org/repos/asf/incubator/log4cxx/trunk@1566645 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | src/changes/changes.xml | 1 | ||||
| -rw-r--r-- | src/main/include/log4cxx/mdc.h | 17 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/changes/changes.xml b/src/changes/changes.xml index f58c106..0857ec3 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -60,6 +60,7 @@ <action issue="LOGCXX-331" type="fix">DailyRollingFileAppender should roll if program doesn't run at rolling time</action> <action issue="LOGCXX-336" type="fix">Test compilation fails: Overloading ambiguity</action> <action issue="LOGCXX-337" type="fix">Suggested fix for socketappender not reconnecting multiple times</action> + <action issue="LOGCXX-339" type="update">Child thread does not inherit a copy of the mapped diagnostic context of its parent</action> <action issue="LOGCXX-340" type="fix">Transcoder::encodeCharsetName bungles encoding</action> <action issue="LOGCXX-351" type="fix">Download page does not have link to KEYS file</action> <action issue="LOGCXX-353" type="fix">When a client disconnects the SocketHubAppender crashes on the next log message</action> diff --git a/src/main/include/log4cxx/mdc.h b/src/main/include/log4cxx/mdc.h index f9cd875..69711a7 100644 --- a/src/main/include/log4cxx/mdc.h +++ b/src/main/include/log4cxx/mdc.h @@ -36,11 +36,6 @@ namespace log4cxx MDC in short, is an instrument for distinguishing interleaved log output from different sources. Log output is typically interleaved when a server handles multiple clients near-simultaneously. - - <p><b><em>The MDC is managed on a per thread basis</em></b>. A - child thread automatically inherits a <em>copy</em> of the mapped - diagnostic context of its parent. - */ class LOG4CXX_EXPORT MDC { @@ -100,7 +95,7 @@ namespace log4cxx * Remove the the context identified by the <code>key</code> * parameter. * @param key key. - * @return value if key had been set, empty if not. + * @return value if key had been set, empty if not. */ static std::string remove(const std::string& key); #if LOG4CXX_WCHAR_T_API @@ -135,7 +130,7 @@ namespace log4cxx * Remove the the context identified by the <code>key</code> * parameter. * @param key key. - * @return value if key had been set, empty if not. + * @return value if key had been set, empty if not. */ static std::wstring remove(const std::wstring& key); #endif @@ -171,7 +166,7 @@ namespace log4cxx * Remove the the context identified by the <code>key</code> * parameter. * @param key key. - * @return value if key had been set, empty if not. + * @return value if key had been set, empty if not. */ static std::basic_string<UniChar> remove(const std::basic_string<UniChar>& key); #endif @@ -207,7 +202,7 @@ namespace log4cxx * Remove the the context identified by the <code>key</code> * parameter. * @param key key. - * @return value if key had been set, empty if not. + * @return value if key had been set, empty if not. */ static CFStringRef remove(const CFStringRef& key); #endif @@ -216,7 +211,7 @@ namespace log4cxx * parameter. * @param key key. * @param prevValue buffer to which previous value is appended. - * @return true if key existed in MDC. + * @return true if key existed in MDC. */ static bool remove(const LogString& key, LogString& prevValue); @@ -228,7 +223,7 @@ namespace log4cxx private: MDC(const MDC&); MDC& operator=(const MDC&); - LogString key; + LogString key; }; // class MDC; } // namespace log4cxx |