You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2018/11/29 11:39:37 UTC
[sling-whiteboard] branch master updated: Don't depend on the
StartupHandler in StartupListenerTracker
This is an automated email from the ASF dual-hosted git repository.
tomekr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new 3ece2f6 Don't depend on the StartupHandler in StartupListenerTracker
3ece2f6 is described below
commit 3ece2f6be736a05a0f3a79e460e4cd8326408f84
Author: Tomek Rękawek <to...@apache.org>
AuthorDate: Thu Nov 29 12:39:08 2018 +0100
Don't depend on the StartupHandler in StartupListenerTracker
---
.../sling/launchpad/startupmanager/StartupListenerTracker.java | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
index c7d55de..eacaa09 100644
--- a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
+++ b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
@@ -16,7 +16,6 @@
*/
package org.apache.sling.launchpad.startupmanager;
-import org.apache.sling.launchpad.api.StartupHandler;
import org.apache.sling.launchpad.api.StartupListener;
import org.apache.sling.launchpad.api.StartupMode;
import org.apache.sling.launchpad.api.StartupService;
@@ -48,12 +47,7 @@ public class StartupListenerTracker implements FrameworkListener, BundleListener
StartupListenerTracker(final BundleContext bundleContext) {
this.bundleContext = bundleContext;
-
- final ServiceReference<StartupHandler> startupHandlerServiceReference = bundleContext.getServiceReference(StartupHandler.class);
- final StartupHandler startupHandler = bundleContext.getService(startupHandlerServiceReference);
- startupMode = startupHandler.getMode();
- bundleContext.ungetService(startupHandlerServiceReference);
-
+ this.startupMode = StartupMode.INSTALL;
tracker = new ServiceTracker<>(bundleContext, StartupListener.class,
new ServiceTrackerCustomizer<StartupListener, StartupListener>() {
@Override
@@ -71,7 +65,7 @@ public class StartupListenerTracker implements FrameworkListener, BundleListener
final StartupListener listener = bundleContext.getService(reference);
if (listener != null) {
try {
- listener.inform(startupHandler.getMode(), frameworkStarted);
+ listener.inform(startupMode, frameworkStarted);
} catch (final Throwable t) {
log.error("Error calling StartupListener {}", listener, t);
}