Author: tschoening
Date: Mon Feb 10 14:52:33 2014
New Revision: 1566645
URL: http://svn.apache.org/r1566645
Log:
LOGCXX-339: Child thread does not inherit a copy of the mapped diagnostic
context of its parent
Modified:
incubator/log4cxx/trunk/src/changes/changes.xml
incubator/log4cxx/trunk/src/main/include/log4cxx/mdc.h
Modified: incubator/log4cxx/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/changes/changes.xml?rev=1566645&r1=1566644&r2=1566645&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/changes/changes.xml (original)
+++ incubator/log4cxx/trunk/src/changes/changes.xml Mon Feb 10 14:52:33 2014
@@ -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>
Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/mdc.h
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/mdc.h?rev=1566645&r1=1566644&r2=1566645&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/main/include/log4cxx/mdc.h (original)
+++ incubator/log4cxx/trunk/src/main/include/log4cxx/mdc.h Mon Feb 10 14:52:33
2014
@@ -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
