summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-29 13:26:24 (EDT)
committerEike Stepper2007-08-29 13:26:24 (EDT)
commit3d6ad0ea65c76cfdca47400751bb1add1ffe8e61 (patch)
treea3ea4d659e9b56bbd9f29bdb4b334a8121687cf2
parent39d85d3ec9ba38b08beb75cf71a46f7b32ae609f (diff)
downloadcdo-3d6ad0ea65c76cfdca47400751bb1add1ffe8e61.zip
cdo-3d6ad0ea65c76cfdca47400751bb1add1ffe8e61.tar.gz
cdo-3d6ad0ea65c76cfdca47400751bb1add1ffe8e61.tar.bz2
[201593] Problem... resource isn't added to the resource in some cases.
https://bugs.eclipse.org/bugs/show_bug.cgi?id=201593
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
index 839eef0..ca8daea 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
@@ -172,7 +172,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
CDOState state = object.cdoState();
if (lastTracedObject != object || lastTracedState != state || lastTracedEvent != event)
{
- TRACER.format("{0}: {1}", event, object);
+ TRACER.format("{0}: {1}", event, object.getClass().getName());
lastTracedObject = object;
lastTracedState = state;
lastTracedEvent = event;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
index 542cf91..a62d76b 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
@@ -162,7 +162,6 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
String path = failOverStrategy.send(request);
CDOResourceImpl resource = (CDOResourceImpl)EresourceFactory.eINSTANCE.createCDOResource();
- resource.setResourceSet(resourceSet);
resource.setPath(path);
InternalCDOObject resourceObject = resource;
@@ -171,6 +170,7 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
resourceObject.cdoInternalSetResource(resource);
resourceObject.cdoInternalSetState(CDOState.PROXY);
+ resourceSet.getResources().add(resource);
return resource;
}
catch (RuntimeException ex)