X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=inline;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fosgi%2FCmsOsgiLogger.java;h=6da1cdd8a6870f5b567f33f89de1daa5cabab9c9;hb=b95462873703848193e56fcbe997693630db6121;hp=405fa46f4a92e27ae93d2422b3f0581ef87c6fb0;hpb=01da06d541cdb4ad614579a37be64b5de900bc20;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsOsgiLogger.java b/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsOsgiLogger.java
index 405fa46f4..6da1cdd8a 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsOsgiLogger.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsOsgiLogger.java
@@ -9,7 +9,6 @@ import org.argeo.cms.runtime.DirectoryConf;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
-import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.log.LogEntry;
 import org.osgi.service.log.LogLevel;
 import org.osgi.service.log.LogListener;
@@ -44,7 +43,10 @@ public class CmsOsgiLogger implements LogListener {
 	//
 	@Override
 	public void logged(LogEntry status) {
-		CmsLog pluginLog = CmsLog.getLog(status.getBundle().getSymbolicName());
+		String loggerName = status.getBundle().getSymbolicName();
+		if (loggerName == null)
+			loggerName = "org.argeo.ext.osgi";
+		CmsLog pluginLog = CmsLog.getLog(loggerName);
 		LogLevel severity = status.getLogLevel();
 		if (severity.equals(LogLevel.ERROR) && pluginLog.isErrorEnabled()) {
 			// FIXME Fix Argeo TP
@@ -89,9 +91,9 @@ public class CmsOsgiLogger implements LogListener {
 			Object cn = sr.getProperty(CmsConstants.CN);
 			if (cn != null)
 				sb.append(" " + CmsConstants.CN + ": " + cn);
-			Object factoryPid = sr.getProperty(ConfigurationAdmin.SERVICE_FACTORYPID);
-			if (factoryPid != null)
-				sb.append(" " + ConfigurationAdmin.SERVICE_FACTORYPID + ": " + factoryPid);
+//			Object factoryPid = sr.getProperty(ConfigurationAdmin.SERVICE_FACTORYPID);
+//			if (factoryPid != null)
+//				sb.append(" " + ConfigurationAdmin.SERVICE_FACTORYPID + ": " + factoryPid);
 			// else {
 			// Object servicePid = sr.getProperty(Constants.SERVICE_PID);
 			// if (servicePid != null)