commit 72c27887c043e240c505a521f2c1375fb0f6fb6a
author Carsten Ziegeler <cziegeler@apache.org> Thu Aug 22 16:17:49 2019 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Thu Aug 22 16:17:49 2019 +0000
tree f3afecf3c6ad1a0fb576acd59c26ea7616c8a2a9
parent a8df6a38522a600244b069dba6b02d905b27f499

Revert FELIX-6173

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1865690 13f79535-47bb-0310-9956-ffa450edef68

log/src/main/java/org/apache/felix/log/Log.java

diff --git a/log/src/main/java/org/apache/felix/log/Log.java b/log/src/main/java/org/apache/felix/log/Log.java
index c01315b..cf69b8d 100644
--- a/log/src/main/java/org/apache/felix/log/Log.java
+++ b/log/src/main/java/org/apache/felix/log/Log.java
@@ -194,22 +194,13 @@
         return new LogNodeEnumeration(m_head, m_tail);
     }
 
-    private String getLoggerNameForEvent(final Bundle bundle, final String defaultName) {
-        if (bundle != null) {
-            if (bundle.getSymbolicName() != null) {
-                return bundle.getSymbolicName().concat(":").concat(bundle.getVersion().toString());
-            }
-        }
-        return defaultName;
-    }
-
     /** The messages returned for the framework events. */
     private static final String[] FRAMEWORK_EVENT_MESSAGES =
     {
         "FrameworkEvent STARTED",
         "FrameworkEvent ERROR",
         "FrameworkEvent PACKAGES REFRESHED",
-        "FrameworkEvent STARTLEVEL CHANGED to ",
+                    "FrameworkEvent STARTLEVEL CHANGED",
         "FrameworkEvent WARNING",
         "FrameworkEvent INFO"
     };
@@ -232,12 +223,8 @@
             }
         }
 
-        if ( event.getType() == FrameworkEvent.STARTLEVEL_CHANGED) {
-            message = message.concat(String.valueOf(m_startLevel.getStartLevel()));
-        }
-
         log(
-            getLoggerNameForEvent(event.getBundle(), "Events.Framework"),
+                "Events.Framework",
             event.getBundle(),
             null,
             (eventType == FrameworkEvent.ERROR) ? LogLevel.ERROR : LogLevel.INFO,
@@ -281,7 +268,7 @@
         if (message != null)
         {
             log(
-                getLoggerNameForEvent(event.getBundle(), "Events.Bundle"),
+                    "Events.Bundle",
                 event.getBundle(),
                 null,
                 LogLevel.INFO,
@@ -330,7 +317,7 @@
         }
 
         log(
-            getLoggerNameForEvent(event.getServiceReference().getBundle(), "Events.Service"),
+                "Events.Service",
             event.getServiceReference().getBundle(),
             event.getServiceReference(),
             (eventType == ServiceEvent.MODIFIED) ? LogLevel.DEBUG : LogLevel.INFO,