Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Alexander Kuppe2010-10-29 15:17:18 +0000
committerMarkus Alexander Kuppe2010-10-29 15:17:18 +0000
commitd66bf6e6d1466d3d6f015186da889a9cea2ca36c (patch)
tree3014243311265e42798722629cda0016f0644da3
parentd27a06d373c2005285682e30639b2aae246dccf6 (diff)
downloadorg.eclipse.ecf-d66bf6e6d1466d3d6f015186da889a9cea2ca36c.tar.gz
org.eclipse.ecf-d66bf6e6d1466d3d6f015186da889a9cea2ca36c.tar.xz
org.eclipse.ecf-d66bf6e6d1466d3d6f015186da889a9cea2ca36c.zip
RESOLVED - bug 329054: [Discovery][Composite] org.eclipse.ecf.provider.discovery.CompositeDiscoveryContainer.connect(ID, IConnectContext) should handle ContainerConnectExceptions in nested discovery providers
https://bugs.eclipse.org/bugs/show_bug.cgi?id=329054
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java b/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java
index f99f3cb54..c9602c78c 100644
--- a/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java
@@ -145,7 +145,13 @@ public class CompositeDiscoveryContainer extends AbstractDiscoveryContainerAdapt
for (final Iterator itr = containers.iterator(); itr.hasNext();) {
final IContainer container = (IContainer) itr.next();
if (container.getConnectedID() == null) {
- container.connect(targetID, connectContext);
+ try {
+ container.connect(targetID, connectContext);
+ } catch (ContainerConnectException cce) {
+ Trace.catching(Activator.PLUGIN_ID, METHODS_TRACING, this.getClass(), "connect", //$NON-NLS-1$
+ cce);
+ continue;
+ }
}
final IDiscoveryLocator idca = (IDiscoveryLocator) container;
idca.addServiceListener(ccsl);

Back to the top