You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/08/28 15:11:40 UTC
[16/50] logging-log4j2 git commit: Fix typecast
Fix typecast
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2e8adc31
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2e8adc31
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2e8adc31
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 2e8adc31c6df9975e29eb543c7c6973302038e40
Parents: 86089b3
Author: Mikael St�ldal <mi...@magine.com>
Authored: Wed Jun 29 21:13:15 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Wed Jun 29 21:13:15 2016 +0200
----------------------------------------------------------------------
.../main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala | 4 ++--
.../main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2e8adc31/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala
----------------------------------------------------------------------
diff --git a/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala b/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala
index 507242e..6ff8e53 100644
--- a/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala
+++ b/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala
@@ -350,7 +350,7 @@ private object LoggerMacro {
List(
reify(Level.TRACE).tree,
reify(AbstractLogger.ENTRY_MARKER).tree,
- reify(null.asInstanceOf[AnyRef]).tree,
+ reify(null: AnyRef).tree,
reify(null).tree
)
)
@@ -365,7 +365,7 @@ private object LoggerMacro {
def traceEntryMessage(c: LoggerContext)(message: c.Expr[Message]): c.Expr[EntryMessage] =
c.universe.reify(
- if (c.prefix.splice.delegate.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)) {
+ if (c.prefix.splice.delegate.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null: AnyRef, null)) {
c.prefix.splice.delegate.traceEntry(message.splice) // TODO should not do ifEnabled check
} else {
null
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2e8adc31/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala
----------------------------------------------------------------------
diff --git a/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala b/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala
index 0f1bac5..5e9fa44 100644
--- a/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala
+++ b/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala
@@ -350,7 +350,7 @@ private object LoggerMacro {
List(
reify(Level.TRACE).tree,
reify(AbstractLogger.ENTRY_MARKER).tree,
- reify(null.asInstanceOf[AnyRef]).tree,
+ reify(null: AnyRef).tree,
reify(null).tree
)
)
@@ -365,7 +365,7 @@ private object LoggerMacro {
def traceEntryMessage(c: LoggerContext)(message: c.Expr[Message]): c.Expr[EntryMessage] =
c.universe.reify(
- if (c.prefix.splice.delegate.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)) {
+ if (c.prefix.splice.delegate.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null: AnyRef, null)) {
c.prefix.splice.delegate.traceEntry(message.splice) // TODO should not do ifEnabled check
} else {
null