diff options
| author | Stoyan Boshev | 2012-01-10 14:04:50 +0000 |
|---|---|---|
| committer | Stoyan Boshev | 2012-01-10 14:04:50 +0000 |
| commit | bc90cc9f25f594afb11c27b3a37a56b82e3793a3 (patch) | |
| tree | 7a8ee32c0db4c005bcf53a8efa5d7e1aa0cad374 /bundles | |
| parent | 6c0ac46a5c1824eef44ae09d3c2d35a791e5d21e (diff) | |
| download | rt.equinox.bundles-bc90cc9f25f594afb11c27b3a37a56b82e3793a3.tar.gz rt.equinox.bundles-bc90cc9f25f594afb11c27b3a37a56b82e3793a3.tar.xz rt.equinox.bundles-bc90cc9f25f594afb11c27b3a37a56b82e3793a3.zip | |
BundleListener is registered after SCRManager initialization is
complete. This avoids possible NPE when SCR starts.
Diffstat (limited to 'bundles')
| -rw-r--r-- | bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/SCRManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/SCRManager.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/SCRManager.java index df693868a..2a66437f2 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/SCRManager.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/SCRManager.java @@ -82,10 +82,6 @@ public class SCRManager implements ServiceListener, SynchronousBundleListener, C if (Activator.startup) Activator.timeLog("resolver.synchronizeServiceReferences() method took "); //$NON-NLS-1$ - Activator.bc.addBundleListener(this); - if (Activator.startup) - Activator.timeLog("addBundleListener() method took "); //$NON-NLS-1$ - String storageClass = Activator.bc.getProperty("scr.storage.class"); //$NON-NLS-1$ if (storageClass == null) { storageClass = "org.eclipse.equinox.internal.ds.storage.file.FileStorage"; //$NON-NLS-1$ @@ -95,6 +91,10 @@ public class SCRManager implements ServiceListener, SynchronousBundleListener, C } catch (Exception e) { Activator.log(null, LogService.LOG_ERROR, NLS.bind(Messages.COULD_NOT_CREATE_INSTANCE, storageClass), e); } + if (Activator.startup) + Activator.timeLog("Creating storage took "); //$NON-NLS-1$ + + Activator.bc.addBundleListener(this); } public void startIt() { |