Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2010-09-04 22:55:01 -0400
committerslewis2010-09-04 22:55:01 -0400
commiteb949e3322ab8b5c3f43ba45ea4842334eed807f (patch)
treec065f1563977ce32970a6eb103f941e6fec976b4
parentda8b67fcddee3914589073a13dbeeca7cf12e938 (diff)
downloadorg.eclipse.ecf-eb949e3322ab8b5c3f43ba45ea4842334eed807f.tar.gz
org.eclipse.ecf-eb949e3322ab8b5c3f43ba45ea4842334eed807f.tar.xz
org.eclipse.ecf-eb949e3322ab8b5c3f43ba45ea4842334eed807f.zip
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=324531
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCommitEvent.java3
3 files changed, 14 insertions, 5 deletions
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF
index fdfe6c404..9127a031a 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.sharedobject;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.100.qualifier
Bundle-Activator: org.eclipse.ecf.internal.core.sharedobject.Activator
Bundle-Localization: plugin
Bundle-Vendor: %plugin.provider
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java
index ca59716db..d69cad8a6 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java
@@ -351,13 +351,15 @@ public class BaseSharedObject implements ISharedObject, IIdentifiable {
*/
protected void sendSharedObjectMsgTo(ID toID, SharedObjectMsg msg) throws IOException {
ISharedObjectContext context = getContext();
+ String method = "sendSharedObjectMsgTo"; //$NON-NLS-1$
+ traceEntering(method, new Object[] {toID, msg});
if (context != null) {
Assert.isNotNull(msg, "SharedObjectMsg cannot be null"); //$NON-NLS-1$
- String method = "sendSharedObjectMsgTo"; //$NON-NLS-1$
- traceEntering(method, new Object[] {toID, msg});
context.sendMessage(toID, new SharedObjectMsgEvent(getID(), toID, msg));
- traceExiting(method);
+ } else {
+ trace(method, "No shared object context available, so no message sent"); //$NON-NLS-1$
}
+ traceExiting(method);
}
/**
@@ -639,4 +641,10 @@ public class BaseSharedObject implements ISharedObject, IIdentifiable {
Trace.catching(Activator.PLUGIN_ID, SharedObjectDebugOptions.EXCEPTIONS_CATCHING, this.getClass(), getSharedObjectAsString(method), t);
}
+ /**
+ * @since 2.2
+ */
+ protected void trace(String method, String message) {
+ Trace.trace(Activator.PLUGIN_ID, SharedObjectDebugOptions.DEBUG, this.getClass(), method, getSharedObjectAsString(method) + ": " + message); //$NON-NLS-1$
+ }
}
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCommitEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCommitEvent.java
index 9b52a2026..438b7deb5 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCommitEvent.java
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCommitEvent.java
@@ -8,10 +8,11 @@
******************************************************************************/
package org.eclipse.ecf.core.sharedobject.events;
+import java.io.Serializable;
import org.eclipse.ecf.core.identity.ID;
import org.eclipse.ecf.core.util.Event;
-public class SharedObjectCommitEvent implements ISharedObjectCommitEvent {
+public class SharedObjectCommitEvent implements ISharedObjectCommitEvent, Serializable {
private static final long serialVersionUID = 4615634472917480497L;
ID senderSharedObjectID = null;

Back to the top