Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2009-04-22 17:20:27 -0400
committerslewis2009-04-22 17:20:27 -0400
commit9cad5092efa2156ce6ea3209431dde60dcad2359 (patch)
treed725ab5bb50542d9b6c96af75eb9e9ad76e6e424
parent48ffa1ee30ae5c01cd1b6acfe43661838d56a62d (diff)
downloadorg.eclipse.ecf-9cad5092efa2156ce6ea3209431dde60dcad2359.tar.gz
org.eclipse.ecf-9cad5092efa2156ce6ea3209431dde60dcad2359.tar.xz
org.eclipse.ecf-9cad5092efa2156ce6ea3209431dde60dcad2359.zip
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=273343
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/SharedObjectDatashareContainerAdapter.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/SharedObjectDatashareContainerAdapter.java b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/SharedObjectDatashareContainerAdapter.java
index 56359d413..cc63ef9cc 100644
--- a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/SharedObjectDatashareContainerAdapter.java
+++ b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/SharedObjectDatashareContainerAdapter.java
@@ -174,13 +174,17 @@ public class SharedObjectDatashareContainerAdapter extends BaseSharedObject impl
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.datashare.IChannelContainerAdapter#disposeChannel(org.eclipse.ecf.core.identity.ID)
+ * @see org.eclipse.ecf.datashare.IChannelContainerAdapter#removeChannel(org.eclipse.ecf.core.identity.ID)
*/
public boolean removeChannel(ID channelID) {
if (channelID == null || channelID.equals(getID()))
return false;
ISharedObject o = getContext().getSharedObjectManager().removeSharedObject(channelID);
- return (o != null);
+ if (o != null && o instanceof IChannel) {
+ ((IChannel) o).dispose();
+ return true;
+ }
+ return false;
}
/*

Back to the top