Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnjum Fatima2019-01-18 21:38:12 +0000
committerAnjum Fatima2019-01-18 21:38:12 +0000
commit85e9de45191302f80195bdc11fd77ebcff5e26f8 (patch)
tree68eea48a8e6fbf4daa704525881b1d9a1bac1807
parent0adca0fc6508387995616781feebf6875e0a882d (diff)
downloadrt.equinox.framework-85e9de45191302f80195bdc11fd77ebcff5e26f8.tar.gz
rt.equinox.framework-85e9de45191302f80195bdc11fd77ebcff5e26f8.tar.xz
rt.equinox.framework-85e9de45191302f80195bdc11fd77ebcff5e26f8.zip
Reverting "Bug 543271 - Update Equinox to filter out logging of theI20190120-1800I20190119-1800I20190118-1800
STARTING/STOPPING bundle event" Change-Id: Ic0eb9c61c237a7d0b084d4e5e4231be47a29c1a9 Signed-off-by: Anjum Fatima <anjum.eclipse@gmail.com>
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LogServiceManager.java3
2 files changed, 4 insertions, 3 deletions
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java
index 4d3f62d3d..1f6ebcd62 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java
@@ -451,12 +451,16 @@ public class LogReaderServiceTest extends AbstractBundleTests {
assertBundleEventLog("BundleEvent INSTALLED", bundle, listener);
assertBundleEventLog("BundleEvent RESOLVED", bundle, listener);
+ assertBundleEventLog("BundleEvent STARTING", bundle, listener);
assertBundleEventLog("BundleEvent STARTED", bundle, listener);
+ assertBundleEventLog("BundleEvent STOPPING", bundle, listener);
assertBundleEventLog("BundleEvent STOPPED", bundle, listener);
assertBundleEventLog("BundleEvent UNRESOLVED", bundle, listener);
assertBundleEventLog("BundleEvent UPDATED", bundle, listener);
assertBundleEventLog("BundleEvent RESOLVED", bundle, listener);
+ assertBundleEventLog("BundleEvent STARTING", bundle, listener);
assertBundleEventLog("BundleEvent STARTED", bundle, listener);
+ assertBundleEventLog("BundleEvent STOPPING", bundle, listener);
assertBundleEventLog("BundleEvent STOPPED", bundle, listener);
assertBundleEventLog("BundleEvent UNRESOLVED", bundle, listener);
assertBundleEventLog("BundleEvent UNINSTALLED", bundle, listener);
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 79f845b98..f87007cb0 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
@@ -131,9 +131,6 @@ public class LogServiceManager implements SynchronousBundleListener, FrameworkLi
if (logReaderServiceFactory.isLoggable(bundle, LOGGER_BUNDLE_EVENT, LogService.LOG_INFO)) {
LoggerImpl logger = (LoggerImpl) systemBundleLog.getLogger(LOGGER_BUNDLE_EVENT);
int eventType = event.getType();
- if (eventType == BundleEvent.STARTING || eventType == BundleEvent.STOPPING || eventType == BundleEvent.LAZY_ACTIVATION) {
- return;
- }
logger.log(bundle, event, null, LogService.LOG_INFO, getBundleEventTypeName(eventType), null, null);
}
}

Back to the top