You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2016/02/07 23:31:01 UTC
[2/2] logging-log4j2 git commit: LOG4J2-1255 - correct cast
LOG4J2-1255 - correct cast
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/38cc8121
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/38cc8121
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/38cc8121
Branch: refs/heads/master
Commit: 38cc8121b7a00e5b8bcbffe7426e219cd895beb0
Parents: fcb2d1f
Author: Ralph Goers <rg...@nextiva.com>
Authored: Sun Feb 7 15:30:40 2016 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Sun Feb 7 15:30:40 2016 -0700
----------------------------------------------------------------------
.../org/apache/logging/log4j/spi/AbstractLogger.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/38cc8121/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
index ab74188..214644a 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
@@ -335,7 +335,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void entry() {
- entry(FQCN, (String) null);
+ entry(FQCN, (Object[]) null);
}
@Override
@@ -351,7 +351,11 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
*/
protected void entry(final String fqcn, final Object... params) {
if (isEnabled(Level.TRACE, ENTRY_MARKER, (Object) null, null)) {
- logMessage(fqcn, Level.TRACE, ENTRY_MARKER, entryMsg(null, params.length, params), null);
+ if (params == null) {
+ logMessage(fqcn, Level.TRACE, ENTRY_MARKER, entryMsg(null, 0, null), null);
+ } else {
+ logMessage(fqcn, Level.TRACE, ENTRY_MARKER, entryMsg(null, params.length, params), null);
+ }
}
}
@@ -361,7 +365,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
protected Message entryMsg(final String format, final int count, final Object... params) {
if (count == 0) {
- if (format == null) {
+ if (format == null || format.length() == 0) {
return messageFactory.newMessage("entry");
} else {
return messageFactory.newMessage("entry: " + format);
@@ -1275,7 +1279,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void traceEntry() {
- enter(FQCN, null, null);
+ enter(FQCN, null, (Object[]) null);
}
@Override