task 1: Develop 0.8.0

2 files changed, 19 insertions, 7 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
index 70fe335084..980927fbc0 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
@@ -105,7 +105,10 @@ public class CDOTransactionImpl
       postCommit(newResources, result);
       postCommit(newObjects, result);
       postCommit(dirtyObjects, result);
-      session.notifyInvalidation(result.getTimeStamp(), dirtyObjects.keySet(), view);
+      if (!dirtyObjects.isEmpty())
+      {
+        session.notifyInvalidation(result.getTimeStamp(), dirtyObjects.keySet(), view);
+      }
 
       newResources.clear();
       newObjects.clear();
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 5d790f2036..63abf8efbf 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
@@ -60,6 +60,10 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
 
   private Map<CDOID, CDOObjectImpl> objects = new HashMap();
 
+  private CDOID lastLookupID;
+
+  private CDOObjectImpl lastLookupObject;
+
   public CDOViewImpl(CDOSessionImpl session, boolean readOnly)
   {
     this.session = session;
@@ -168,7 +172,6 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
       resourceObject.setResource(resource);
       resourceObject.setState(CDOState.PROXY);
 
-      resources.add(resource);
       return resource;
     }
     catch (Exception ex)
@@ -184,14 +187,20 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
       TRACER.format("Looking up object {0}", id);
     }
 
-    CDOObjectImpl object = objects.get(id);
-    if (object == null)
+    if (id.equals(lastLookupID))
     {
-      object = createObject(id);
-      registerObject(object);
+      return lastLookupObject;
     }
 
-    return object;
+    lastLookupID = id;
+    lastLookupObject = objects.get(id);
+    if (lastLookupObject == null)
+    {
+      lastLookupObject = createObject(id);
+      registerObject(lastLookupObject);
+    }
+
+    return lastLookupObject;
   }
 
   public void registerObject(CDOObjectImpl object)