You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/09/21 20:35:43 UTC
[1/2] git commit: Better svar name (all caps for static final).
Repository: logging-log4j2
Updated Branches:
refs/heads/master cc30d6dd6 -> b461f006b
Better svar name (all caps for static final).
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4531a9c6
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4531a9c6
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4531a9c6
Branch: refs/heads/master
Commit: 4531a9c69046ab03fe95ae3f448789cfd099d915
Parents: cc30d6d
Author: Matt Sicker <ma...@apache.org>
Authored: Sun Sep 21 13:34:07 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sun Sep 21 13:34:07 2014 -0500
----------------------------------------------------------------------
.../org/apache/logging/log4j/MarkerManager.java | 24 ++++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4531a9c6/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java b/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java
index 5bf38e1..d57e9d3 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java
@@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentMap;
*/
public final class MarkerManager {
- private static final ConcurrentMap<String, Marker> markerMap = new ConcurrentHashMap<String, Marker>();
+ private static final ConcurrentMap<String, Marker> MARKERS = new ConcurrentHashMap<String, Marker>();
private MarkerManager() {
// do nothing
@@ -37,7 +37,7 @@ public final class MarkerManager {
* Clears all markers.
*/
public static void clear() {
- markerMap.clear();
+ MARKERS.clear();
}
/**
@@ -47,8 +47,8 @@ public final class MarkerManager {
* @throws IllegalArgumentException if the argument is {@code null}
*/
public static Marker getMarker(final String name) {
- markerMap.putIfAbsent(name, new Log4jMarker(name));
- return markerMap.get(name);
+ MARKERS.putIfAbsent(name, new Log4jMarker(name));
+ return MARKERS.get(name);
}
/**
@@ -61,7 +61,7 @@ public final class MarkerManager {
*/
@Deprecated
public static Marker getMarker(final String name, final String parent) {
- final Marker parentMarker = markerMap.get(parent);
+ final Marker parentMarker = MARKERS.get(parent);
if (parentMarker == null) {
throw new IllegalArgumentException("Parent Marker " + parent + " has not been defined");
}
@@ -80,18 +80,18 @@ public final class MarkerManager {
*/
@Deprecated
public static Marker getMarker(final String name, final Marker parent) {
- markerMap.putIfAbsent(name, new Log4jMarker(name));
- return markerMap.get(name).addParents(parent);
+ MARKERS.putIfAbsent(name, new Log4jMarker(name));
+ return MARKERS.get(name).addParents(parent);
}
-
+
/**
* <em>Consider this class private, it is only public to satisfy Jackson for XML and JSON IO.</em>
* <p>
* The actual Marker implementation.
* </p>
* <p>
- * <em>Internal note: We could make this class package private instead of public if the class
- * {@code org.apache.logging.log4j.core.jackson.MarkerMixIn}
+ * <em>Internal note: We could make this class package private instead of public if the class
+ * {@code org.apache.logging.log4j.core.jackson.MarkerMixIn}
* is moved to this package and would of course stay in its current module.</em>
* </p>
*/
@@ -100,7 +100,7 @@ public final class MarkerManager {
private static final long serialVersionUID = 100L;
private final String name;
-
+
private volatile Marker[] parents;
/**
@@ -269,7 +269,7 @@ public final class MarkerManager {
return true;
}
// Use a real marker for child comparisons. It is faster than comparing the names.
- final Marker marker = markerMap.get(markerName);
+ final Marker marker = MARKERS.get(markerName);
if (marker == null) {
return false;
}
[2/2] git commit: Javadoc update for recently added method.
Posted by ma...@apache.org.
Javadoc update for recently added method.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b461f006
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b461f006
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b461f006
Branch: refs/heads/master
Commit: b461f006b2342f2d3b1999ebf820e2a0b1bca309
Parents: 4531a9c
Author: Matt Sicker <ma...@apache.org>
Authored: Sun Sep 21 13:35:38 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sun Sep 21 13:35:38 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/io/LoggerPrintWriter.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b461f006/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerPrintWriter.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerPrintWriter.java b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerPrintWriter.java
index d9b0c35..ab7977c 100644
--- a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerPrintWriter.java
+++ b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerPrintWriter.java
@@ -32,16 +32,15 @@ import org.apache.logging.log4j.spi.ExtendedLogger;
* Integration with JDBC logging can be as simple as:
* </p>
* <pre>
- * Logger logger = LogManager.getLogger();
- * PrintWriter pw = IoBuilder.forLogger(logger).setLevel(Level.DEBUG).buildPrintWriter();
+ * PrintWriter pw = IoBuilder.forLogger().setLevel(Level.DEBUG).buildPrintWriter();
* DriverManager.setLogWriter(pw);
* DataSource ds = ...
* ds.setLogWriter(pw);
* </pre>
- *
+ *
* @since 2.1
*/
-// TODO
+// TODO
// All method implementations that call only super are apparently required for the unit tests to pass.
// Not sure if this a bug in the tests or a feature.
public class LoggerPrintWriter extends PrintWriter {