Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2005-05-23 03:40:07 +0000
committerslewis2005-05-23 03:40:07 +0000
commit65c33767e735cf405e18b8a0fb3d46d29717f2bc (patch)
tree08501bbe95e854bc5f98ffdf2ab431c57c1b0113 /examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf
parent9b5b9b9c1291f42f4e1a6e88023d2e2e53b2d472 (diff)
downloadorg.eclipse.ecf-65c33767e735cf405e18b8a0fb3d46d29717f2bc.tar.gz
org.eclipse.ecf-65c33767e735cf405e18b8a0fb3d46d29717f2bc.tar.xz
org.eclipse.ecf-65c33767e735cf405e18b8a0fb3d46d29717f2bc.zip
Added setJoinPolicy to ISharedObjectContainerGroupManager interface and generic provider implementation. Added setAddSharedObject to ISharedObjectManager interface and generic provider and test provider implementations. Also corrected trivial bug in clean up code for org.eclipse.ecf.sdo project.
Diffstat (limited to 'examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf')
-rw-r--r--examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharing.java13
1 files changed, 9 insertions, 4 deletions
diff --git a/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharing.java b/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharing.java
index d679269ba..ca68a1a28 100644
--- a/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharing.java
+++ b/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharing.java
@@ -12,6 +12,7 @@ package org.eclipse.ecf.internal.sdo;
import org.eclipse.ecf.core.ISharedObject;
import org.eclipse.ecf.core.ISharedObjectConfig;
+import org.eclipse.ecf.core.ISharedObjectContext;
import org.eclipse.ecf.core.ISharedObjectManager;
import org.eclipse.ecf.core.SharedObjectInitException;
import org.eclipse.ecf.core.identity.ID;
@@ -133,10 +134,14 @@ public class DataGraphSharing implements
* @see org.eclipse.ecf.core.ISharedObject#dispose(org.eclipse.ecf.core.identity.ID)
*/
public synchronized void dispose(ID containerID) {
- if (config != null
- && config.getContext().getLocalContainerID()
- .equals(containerID))
- config = null;
+ if (config != null) {
+ ISharedObjectContext context = config.getContext();
+ if (context != null) {
+ if (context.getLocalContainerID().equals(containerID)) {
+ config = null;
+ }
+ }
+ }
}
/* (non-Javadoc)

Back to the top