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/09 07:56:43 UTC
svn commit: r1837694 - in /felix/trunk/scr: changelog.txt
src/main/java/org/apache/felix/scr/impl/logger/R7LogServiceLogger.java
src/main/java/org/osgi/service/log/LoggerFactory.java
Author: cziegeler
Date: Thu Aug 9 07:56:43 2018
New Revision: 1837694
URL: http://svn.apache.org/viewvc?rev=1837694&view=rev
Log:
FELIX-5902 : java.lang.IllegalArgumentException: Bundle org.apache.felix.scr is not resolved with R7 LogService
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/LoggerFactory.java
Modified: felix/trunk/scr/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scr/changelog.txt?rev=1837694&r1=1837693&r2=1837694&view=diff
==============================================================================
--- felix/trunk/scr/changelog.txt (original)
+++ felix/trunk/scr/changelog.txt Thu Aug 9 07:56:43 2018
@@ -1,6 +1,12 @@
Changes in 2.1.2
----------------
** Bug
+ * [FELIX-5902] - java.lang.IllegalArgumentException: Bundle org.apache.felix.scr is not resolved with R7 LogService
+
+
+Changes in 2.1.2
+----------------
+** Bug
* [FELIX-5866] - SCR does not respect the log level set in LoggerAdmin
* [FELIX-5865] - SCR R7 logging support doesn't work on equinox framework
* [FELIX-5867] - Reference field of type Logger for service LoggerFactory is always null
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=1837694&r1=1837693&r2=1837694&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 Thu Aug 9 07:56:43 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(bundle, name, Logger.class);
+ this.logger = ((LoggerFactory)loggerFactory).getLogger(name, Logger.class);
}
@Override
Modified: felix/trunk/scr/src/main/java/org/osgi/service/log/LoggerFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/osgi/service/log/LoggerFactory.java?rev=1837694&r1=1837693&r2=1837694&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/osgi/service/log/LoggerFactory.java (original)
+++ felix/trunk/scr/src/main/java/org/osgi/service/log/LoggerFactory.java Thu Aug 9 07:56:43 2018
@@ -16,7 +16,6 @@
package org.osgi.service.log;
import org.osgi.annotation.versioning.ProviderType;
-import org.osgi.framework.Bundle;
/**
* This is a stripped down copy of the LogService 1.4 API (R7). It's
@@ -26,6 +25,7 @@ import org.osgi.framework.Bundle;
@ProviderType
public interface LoggerFactory {
- <L extends Logger> L getLogger(Bundle bundle, String name,
- Class<L> loggerType);
+ <L extends Logger> L getLogger(String name,
+ Class<L> loggerType);
+
}