Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnjum Fatima2017-06-20 18:41:01 +0000
committerAnjum Fatima2017-06-20 20:27:59 +0000
commit8fe0bed86a3ffaf04a435eb95ba139b0c080e11e (patch)
tree12ccd1860076002c35a39b0c2aafe24b30d29f8b /bundles/org.eclipse.osgi
parentb0a059a676e6245c25ab0dacb5cd40a5c704e663 (diff)
downloadrt.equinox.framework-8fe0bed86a3ffaf04a435eb95ba139b0c080e11e.tar.gz
rt.equinox.framework-8fe0bed86a3ffaf04a435eb95ba139b0c080e11e.tar.xz
rt.equinox.framework-8fe0bed86a3ffaf04a435eb95ba139b0c080e11e.zip
Bug 518476 - [log] FrameworkEvent of type WARN should be logged as type
WARN Change-Id: I5685496e9f9e4a60c48f13d6529f262d7a87150e Signed-off-by: Anjum Fatima <anjum.eclipse@gmail.com>
Diffstat (limited to 'bundles/org.eclipse.osgi')
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LogServiceManager.java14
1 files changed, 13 insertions, 1 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LogServiceManager.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LogServiceManager.java
index 8ee51d9dc..788a5fcd6 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LogServiceManager.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LogServiceManager.java
@@ -130,7 +130,19 @@ public class LogServiceManager implements BundleListener, FrameworkListener, Ser
Bundle bundle = event.getBundle();
int eventType = event.getType();
@SuppressWarnings("deprecation")
- int logType = (eventType == FrameworkEvent.ERROR) ? LogService.LOG_ERROR : LogService.LOG_INFO;
+ int logType;
+ switch (eventType) {
+ case FrameworkEvent.ERROR :
+ logType = LogService.LOG_ERROR;
+ break;
+ case FrameworkEvent.WARNING :
+ logType = LogService.LOG_WARNING;
+ break;
+ default :
+ logType = LogService.LOG_INFO;
+ break;
+ }
+
if (logReaderServiceFactory.isLoggable(bundle, LOGGER_FRAMEWORK_EVENT, logType)) {
LoggerImpl logger = (LoggerImpl) systemBundleLog.getLogger(LOGGER_FRAMEWORK_EVENT);
logger.log(bundle, null, null, logType, getFrameworkEventTypeName(eventType), event.getThrowable());

Back to the top