diff options
| author | Thomas Watson | 2012-03-19 20:29:01 +0000 |
|---|---|---|
| committer | Thomas Watson | 2012-03-19 20:29:01 +0000 |
| commit | d484b47054e316cfbfba61e3178cecc24ac1d378 (patch) | |
| tree | ae8cdd5198d9f3b1659344be16799abc448ff1f6 /bundles/org.eclipse.equinox.cm | |
| parent | 96b97263b06ccef1ee05dd2957592f640bacb94b (diff) | |
| download | rt.equinox.bundles-d484b47054e316cfbfba61e3178cecc24ac1d378.tar.gz rt.equinox.bundles-d484b47054e316cfbfba61e3178cecc24ac1d378.tar.xz rt.equinox.bundles-d484b47054e316cfbfba61e3178cecc24ac1d378.zip | |
Bug 374637 - NPE in ManagedServiceTracker.addv20120319-2029I20120328-2028I20120328-2020I20120328-2007I20120328-1956
Diffstat (limited to 'bundles/org.eclipse.equinox.cm')
| -rw-r--r-- | bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/ManagedServiceTracker.java | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF index 547f2f85c..5efd2b3f7 100644 --- a/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %bundleName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.equinox.cm -Bundle-Version: 1.0.300.qualifier +Bundle-Version: 1.0.400.qualifier Bundle-Activator: org.eclipse.equinox.internal.cm.Activator Import-Package: org.osgi.framework;version="1.3.0", org.osgi.service.cm;version="[1.3,1.5)", diff --git a/bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/ManagedServiceTracker.java b/bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/ManagedServiceTracker.java index 0148cc092..cf10b6828 100644 --- a/bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/ManagedServiceTracker.java +++ b/bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/ManagedServiceTracker.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2008 Cognos Incorporated, IBM Corporation and others. + * Copyright (c) 2005, 2012 Cognos Incorporated, IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -93,8 +93,10 @@ class ManagedServiceTracker extends ServiceTracker { private void add(ServiceReference reference, String pid, ManagedService service) { ConfigurationImpl config = configurationStore.findConfiguration(pid); - if (config == null && trackManagedService(pid, reference, service)) { - asynchUpdated(service, null); + if (config == null) { + if (trackManagedService(pid, reference, service)) { + asynchUpdated(service, null); + } } else { try { config.lock(); |