Bug 397703 - [region] bundle and service hooks throw IllegalStateException if finder context becomes invalidv20130108-172736R4_2_2R3_8_2M20130206-1200M20130206-1000M20130204-1200M20130204-1000M20130131-1000M20130131-0800M20130125-1200M20130125-1000M20130124-1700M20130124-1500M20130123-1500M20130123-1200M20130123-1000M20130116-1800M20130116-1715M20130116-1200M20130116-1030M20130116-1000M20130109-1200M20130109-1000

3 files changed, 27 insertions, 18 deletions

diff --git a/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF
index 5508b232a..ae5f6d3a1 100644
--- a/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.equinox.region
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.management,
  org.eclipse.osgi.service.resolver;version="1.5.0";resolution:=optional,
diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionBundleFindHook.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionBundleFindHook.java
index 3d09e62e6..f0aa2e139 100644
--- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionBundleFindHook.java
+++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionBundleFindHook.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 VMware Inc.
+ * Copyright (c) 2013 VMware Inc.
  * 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
@@ -40,14 +40,19 @@ public final class RegionBundleFindHook implements FindHook {
 	 */
 	@Override
 	public void find(BundleContext context, Collection<Bundle> bundles) {
-		long bundleID = context.getBundle().getBundleId();
-
+		Bundle finderBundle = getBundle(context);
+		if (finderBundle == null) {
+			// invalid finder bundle; clear out result
+			bundles.clear();
+			return;
+		}
+		long bundleID = finderBundle.getBundleId();
 		if (bundleID == 0 || bundleID == hookImplID) {
 			// The system bundle and the hook impl bundle can see all bundles
 			return;
 		}
 
-		Region finderRegion = getRegion(context);
+		Region finderRegion = this.regionDigraph.getRegion(finderBundle);
 		if (finderRegion == null) {
 			bundles.clear();
 			return;
@@ -81,10 +86,14 @@ public final class RegionBundleFindHook implements FindHook {
 		protected boolean isAllowed(Bundle candidate, RegionFilter filter) {
 			return filter.isAllowed(candidate);
 		}
-
 	}
 
-	private Region getRegion(BundleContext context) {
-		return this.regionDigraph.getRegion(context.getBundle());
+	static Bundle getBundle(BundleContext context) {
+		try {
+			return context.getBundle();
+		} catch (IllegalStateException e) {
+			// happens if the context is invalid
+			return null;
+		}
 	}
 }
diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionServiceFindHook.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionServiceFindHook.java
index 2eb7ea96d..2ee9d3c09 100644
--- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionServiceFindHook.java
+++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionServiceFindHook.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 VMware Inc.
+ * Copyright (c) 2013 VMware Inc.
  * 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
@@ -13,8 +13,7 @@ package org.eclipse.equinox.internal.region.hook;
 
 import java.util.Collection;
 import org.eclipse.equinox.region.*;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
+import org.osgi.framework.*;
 import org.osgi.framework.hooks.service.FindHook;
 
 /**
@@ -37,11 +36,17 @@ public final class RegionServiceFindHook implements FindHook {
 	 * {@inheritDoc}
 	 */
 	public void find(BundleContext context, String name, String filter, boolean allServices, Collection<ServiceReference<?>> references) {
-		if (context.getBundle().getBundleId() == 0L) {
+		Bundle finderBundle = RegionBundleFindHook.getBundle(context);
+		if (finderBundle == null) {
+			// invalid finder bundle; clear out result
+			references.clear();
+			return;
+		}
+		if (finderBundle.getBundleId() == 0L) {
 			return;
 		}
 
-		Region finderRegion = getRegion(context);
+		Region finderRegion = this.regionDigraph.getRegion(finderBundle);
 		if (finderRegion == null) {
 			references.clear();
 			return;
@@ -77,9 +82,4 @@ public final class RegionServiceFindHook implements FindHook {
 		}
 
 	}
-
-	private Region getRegion(BundleContext context) {
-		return this.regionDigraph.getRegion(context.getBundle());
-	}
-
 }