From 3d6ad0ea65c76cfdca47400751bb1add1ffe8e61 Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Wed, 29 Aug 2007 17:26:24 +0000
Subject: [201593] Problem... resource isn't added to the resource in some
 cases. https://bugs.eclipse.org/bugs/show_bug.cgi?id=201593

---
 .../src/org/eclipse/emf/internal/cdo/CDOStateMachine.java               | 2 +-
 .../src/org/eclipse/emf/internal/cdo/CDOViewImpl.java                   | 2 +-
 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 839eef0a9e..ca8daeae96 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 542cf910a0..a62d76ba25 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)
-- 
cgit v1.2.3