Small bug fix for shared object message handling and added to manifest.mf to allow for dynamic classloading for serialized classes

2 files changed, 7 insertions, 7 deletions

diff --git a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
index 26aecc3a9..ce7cbf345 100644
--- a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
@@ -9,6 +9,6 @@ Bundle-Localization: plugin
 Eclipse-AutoStart: true
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ecf
-Provide-Package: org.eclipse.ecf.provider.comm.tcp, org.eclipse.ecf.provider.generic, org.eclipse.ecf.provider.generic.gmm, org.eclipse.ecf.provider.generic.user
+Provide-Package: org.eclipse.ecf.provider.comm.tcp, org.eclipse.ecf.provider.generic, org.eclipse.ecf.provider.generic.sobject, org.eclipse.ecf.provider.generic.gmm, org.eclipse.ecf.provider.generic.user
 DynamicImport-Package: *
 
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
index edd7b93c0..fd984a73b 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
@@ -564,12 +564,14 @@ public abstract class SOContainer implements ISharedObjectContainer {
 		try {
 			obj = ois.readObject();
 		} catch (ClassNotFoundException e) {
+            e.printStackTrace(System.err);
 			dumpStack("class not found for message", e);
 			return null;
 		}
 		if (obj instanceof ContainerMessage) {
 			return (ContainerMessage) obj;
 		} else {
+            System.out.println("message is not a containermessage "+obj);
 			debug("message received is not containermessage:" + obj);
 			return null;
 		}
@@ -740,12 +742,10 @@ public abstract class SOContainer implements ISharedObjectContainer {
 		ContainerMessage.SharedObjectMessage resp = (ContainerMessage.SharedObjectMessage) mess
 				.getData();
 		synchronized (getGroupMembershipLock()) {
-			if (toID == null || toID.equals(getID())) {
-				SOWrapper sow = getSharedObjectWrapper(resp
-						.getFromSharedObjectID());
-				if (sow != null) {
-					sow.deliverSharedObjectMessage(fromID, resp.getData());
-				}
+			SOWrapper sow = getSharedObjectWrapper(resp
+					.getFromSharedObjectID());
+			if (sow != null) {
+				sow.deliverSharedObjectMessage(fromID, resp.getData());
 			}
 			forward(fromID, toID, mess);
 		}