Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Kaegi2007-03-05 13:29:54 +0000
committerSimon Kaegi2007-03-05 13:29:54 +0000
commitee6e9d90b2685a1c67a837de6d6513152e04d975 (patch)
tree6e82171d12b74fd04d8de557cafbb34658a91c78 /bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox
parent345d7611882766b9b0829e3dbbb7c307b2abb3fc (diff)
downloadrt.equinox.bundles-ee6e9d90b2685a1c67a837de6d6513152e04d975.tar.gz
rt.equinox.bundles-ee6e9d90b2685a1c67a837de6d6513152e04d975.tar.xz
rt.equinox.bundles-ee6e9d90b2685a1c67a837de6d6513152e04d975.zip
unlogged - HttpServiceTracker should check that context.getService is returning a non-null service instance.
Diffstat (limited to 'bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox')
-rw-r--r--bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/HttpServiceTracker.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/HttpServiceTracker.java b/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/HttpServiceTracker.java
index 61234d974..49c2b3b02 100644
--- a/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/HttpServiceTracker.java
+++ b/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/HttpServiceTracker.java
@@ -52,6 +52,8 @@ public class HttpServiceTracker extends ServiceTracker {
public synchronized Object addingService(ServiceReference reference) {
HttpService httpService = (HttpService) context.getService(reference);
+ if (httpService == null)
+ return null;
HttpContextManager httpContextManager = new HttpContextManager(httpService, packageAdmin, registry);
httpContextManager.start();

Back to the top