You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2018/08/13 05:19:08 UTC
svn commit: r1837919 - in /felix/trunk/scr: changelog.txt
src/main/java/org/apache/felix/scr/impl/logger/R7LogServiceLogger.java
src/main/java/org/osgi/service/log/Logger.java
Author: cziegeler
Date: Mon Aug 13 05:19:08 2018
New Revision: 1837919
URL: http://svn.apache.org/viewvc?rev=1837919&view=rev
Log:
FELIX-5904 : SCR is creating a logger instance using name <null>
Modified:
felix/trunk/scr/changelog.txt
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/logger/R7LogServiceLogger.java
felix/trunk/scr/src/main/java/org/osgi/service/log/Logger.java
Modified: felix/trunk/scr/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scr/changelog.txt?rev=1837919&r1=1837918&r2=1837919&view=diff
==============================================================================
--- felix/trunk/scr/changelog.txt (original)
+++ felix/trunk/scr/changelog.txt Mon Aug 13 05:19:08 2018
@@ -1,7 +1,8 @@
-Changes in 2.1.2
+Changes in 2.1.6
----------------
** Bug
* [FELIX-5902] - java.lang.IllegalArgumentException: Bundle org.apache.felix.scr is not resolved with R7 LogService
+ * [FELIX-5904] - SCR is creating a logger instance using name "null"
Changes in 2.1.2
Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/logger/R7LogServiceLogger.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/logger/R7LogServiceLogger.java?rev=1837919&r1=1837918&r2=1837919&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/logger/R7LogServiceLogger.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/logger/R7LogServiceLogger.java Mon Aug 13 05:19:08 2018
@@ -32,7 +32,7 @@ class R7LogServiceLogger implements Inte
public R7LogServiceLogger(final Bundle bundle, final LogService loggerFactory, final String name)
{
- this.logger = ((LoggerFactory)loggerFactory).getLogger(name, Logger.class);
+ this.logger = ((LoggerFactory)loggerFactory).getLogger(name == null ? Logger.ROOT_LOGGER_NAME : name, Logger.class);
}
@Override
Modified: felix/trunk/scr/src/main/java/org/osgi/service/log/Logger.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/osgi/service/log/Logger.java?rev=1837919&r1=1837918&r2=1837919&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/osgi/service/log/Logger.java (original)
+++ felix/trunk/scr/src/main/java/org/osgi/service/log/Logger.java Mon Aug 13 05:19:08 2018
@@ -25,6 +25,8 @@ import org.osgi.annotation.versioning.Pr
@ProviderType
public interface Logger {
+ String ROOT_LOGGER_NAME = "ROOT";
+
boolean isDebugEnabled();
void debug(String message);