Fixes for remove failure

2 files changed, 6 insertions, 6 deletions

diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShareRosterContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShareRosterContributionItem.java
index 82e634700..0cef175ff 100644
--- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShareRosterContributionItem.java
+++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShareRosterContributionItem.java
@@ -70,8 +70,8 @@ public class URLShareRosterContributionItem extends
 			final URLShare urlshare) {
 		IAction action = new Action() {
 			public void run() {
-				urlshare.dispose();
 				removeURLShare(containerID);
+				urlshare.dispose();
 			}
 		};
 		action
diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShareRosterContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShareRosterContributionItem.java
index 31bcaeee7..e01d17168 100644
--- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShareRosterContributionItem.java
+++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShareRosterContributionItem.java
@@ -69,11 +69,11 @@ public class ViewShareRosterContributionItem extends
 	}
 
 	private IAction[] createActionRemove(final ID containerID,
-			final ViewShare ViewShare) {
+			final ViewShare viewShare) {
 		IAction action = new Action() {
 			public void run() {
-				ViewShare.dispose();
 				removeViewShare(containerID);
+				viewShare.dispose();
 			}
 		};
 		action
@@ -88,10 +88,10 @@ public class ViewShareRosterContributionItem extends
 			IContainer c = getContainerForRoster(roster);
 			if (c != null) {
 				// Get existing ViewShare for this container (if it exists)
-				ViewShare ViewShare = getViewShare(c.getID());
+				ViewShare viewShare = getViewShare(c.getID());
 				// If it does exist already, then create action to remove
-				if (ViewShare != null)
-					return createActionRemove(c.getID(), ViewShare);
+				if (viewShare != null)
+					return createActionRemove(c.getID(), viewShare);
 				else {
 					IChannelContainerAdapter channelAdapter = (IChannelContainerAdapter) c
 							.getAdapter(IChannelContainerAdapter.class);