Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2008-10-21 21:19:19 -0400
committerslewis2008-10-21 21:19:19 -0400
commit1910c7d5e9378728a4a666417dcb7f356eb69ea2 (patch)
tree056a851fc41da8780ed88c77fb97a7bd134a6c63
parent3b030e5eb08915ba736ac90200878a7a48f56104 (diff)
downloadorg.eclipse.ecf-1910c7d5e9378728a4a666417dcb7f356eb69ea2.tar.gz
org.eclipse.ecf-1910c7d5e9378728a4a666417dcb7f356eb69ea2.tar.xz
org.eclipse.ecf-1910c7d5e9378728a4a666417dcb7f356eb69ea2.zip
Made extension point handling more robust
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/views/DiscoveryView.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/views/DiscoveryView.java b/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/views/DiscoveryView.java
index 8ac0b6598..750e568ad 100644
--- a/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/views/DiscoveryView.java
+++ b/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/views/DiscoveryView.java
@@ -321,7 +321,10 @@ public class DiscoveryView extends ViewPart implements ITabbedPropertySheetPageC
for (int i = 0; i < serviceAccessConfigurationElements.length; i++) {
try {
final IServiceAccessHandler sah = (IServiceAccessHandler) serviceAccessConfigurationElements[i].createExecutableExtension("class"); //$NON-NLS-1$
- results.add(sah.getContributionsForService(serviceInfo));
+ IContributionItem[] contributions = sah.getContributionsForService(serviceInfo);
+ if (contributions != null) {
+ results.add(contributions);
+ }
} catch (final Exception e) {
Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, IStatus.WARNING, Messages.DiscoveryView_EXCEPTION_CREATING_SERVICEACCESSHANDLER, e));
}

Back to the top