summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch')
-rw-r--r--dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch152
1 files changed, 152 insertions, 0 deletions
diff --git a/dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch b/dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch
new file mode 100644
index 000000000000..e8a3a50a41fd
--- /dev/null
+++ b/dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch
@@ -0,0 +1,152 @@
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/AbstractMdcLoggerProvider.java.orig 2015-05-17 20:55:35.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/AbstractMdcLoggerProvider.java 2015-05-17 20:58:00.000000000 +0000
+@@ -23,27 +23,27 @@
+
+ abstract class AbstractMdcLoggerProvider extends AbstractLoggerProvider {
+
+- private final ThreadLocal<Map<String, Object>> mdcMap = new ThreadLocal<Map<String, Object>>();
++ private final ThreadLocal<Map<String, String>> mdcMap = new ThreadLocal<Map<String, String>>();
+
+ public Object getMdc(String key) {
+ return mdcMap.get() == null ? null : mdcMap.get().get(key);
+ }
+
+- public Map<String, Object> getMdcMap() {
++ public Map<String, String> getMdcMap() {
+ return mdcMap.get();
+ }
+
+- public Object putMdc(String key, Object value) {
+- Map<String, Object> map = mdcMap.get();
++ public Object putMdc(String key, String value) {
++ Map<String, String> map = mdcMap.get();
+ if (map == null) {
+- map = new HashMap<String, Object>();
++ map = new HashMap<String, String>();
+ mdcMap.set(map);
+ }
+ return map.put(key, value);
+ }
+
+ public void removeMdc(String key) {
+- Map<String, Object> map = mdcMap.get();
++ Map<String, String> map = mdcMap.get();
+ if (map == null)
+ return;
+ map.remove(key);
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Log4jLoggerProvider.java.orig 2015-05-17 20:16:57.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Log4jLoggerProvider.java 2015-05-17 21:21:25.157000000 +0000
+@@ -34,11 +34,11 @@
+ }
+
+ @SuppressWarnings("unchecked")
+- public Map<String, Object> getMdcMap() {
++ public Map<String, String> getMdcMap() {
+ return MDC.getContext();
+ }
+
+- public Object putMdc(String key, Object val) {
++ public Object putMdc(String key, String val) {
+ try {
+ return MDC.get(key);
+ } finally {
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java.orig 2015-05-17 20:44:24.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java 2015-05-17 21:22:05.205000000 +0000
+@@ -33,14 +33,14 @@
+ return new Slf4jLogger(name, l);
+ }
+
+- public Object putMdc(final String key, final Object value) {
++ public Object putMdc(final String key, final String value) {
+ try {
+ return MDC.get(key);
+ } finally {
+ if (value == null) {
+ MDC.remove(key);
+ } else {
+- MDC.put(key, String.valueOf(value));
++ MDC.put(key, value);
+ }
+ }
+ }
+@@ -54,7 +54,7 @@
+ }
+
+ @SuppressWarnings({ "unchecked" })
+- public Map<String, Object> getMdcMap() {
++ public Map<String, String> getMdcMap() {
+ return MDC.getCopyOfContextMap();
+ }
+ }
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JDKLoggerProvider.java.orig 2015-05-17 21:19:12.964000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JDKLoggerProvider.java 2015-05-17 21:22:41.639000000 +0000
+@@ -23,4 +23,9 @@
+ public Logger getLogger(final String name) {
+ return new JDKLogger(name);
+ }
++
++ @Override
++ public Object putMdc(String key, String value) {
++ return null;
++ }
+ }
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JBossLogManagerProvider.java.orig 2015-05-17 20:15:41.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JBossLogManagerProvider.java 2015-05-17 21:20:42.844000000 +0000
+@@ -59,8 +59,8 @@
+ }
+ }
+
+- public Object putMdc(final String key, final Object value) {
+- return MDC.put(key, String.valueOf(value));
++ public Object putMdc(final String key, final String value) {
++ return MDC.put(key, value);
+ }
+
+ public Object getMdc(final String key) {
+@@ -72,7 +72,7 @@
+ }
+
+ @SuppressWarnings({ "unchecked" })
+- public Map<String, Object> getMdcMap() {
++ public Map<String, String> getMdcMap() {
+ // we can re-define the erasure of this map because MDC does not make further use of the copy
+ return (Map)MDC.copy();
+ }
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/MDC.java.orig 2015-05-17 19:12:40.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/MDC.java 2015-05-17 21:22:27.689000000 +0000
+@@ -25,7 +25,7 @@
+ private MDC() {
+ }
+
+- public static Object put(String key, Object val) {
++ public static Object put(String key, String val) {
+ return LoggerProviders.PROVIDER.putMdc(key, val);
+ }
+
+@@ -37,7 +37,7 @@
+ LoggerProviders.PROVIDER.removeMdc(key);
+ }
+
+- public static Map<String, Object> getMap() {
++ public static Map<String, String> getMap() {
+ return LoggerProviders.PROVIDER.getMdcMap();
+ }
+ }
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/LoggerProvider.java.orig 2015-05-17 19:06:30.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/LoggerProvider.java 2015-05-17 21:21:43.083000000 +0000
+@@ -23,13 +23,13 @@
+ public interface LoggerProvider {
+ Logger getLogger(String name);
+
+- Object putMdc(String key, Object value);
++ Object putMdc(String key, String value);
+
+ Object getMdc(String key);
+
+ void removeMdc(String key);
+
+- Map<String, Object> getMdcMap();
++ Map<String, String> getMdcMap();
+
+ void clearNdc();
+