commit 3620ce17db0c863bd64f377612ae50bb202c1d30
author Eike Stepper <stepper@esc-net.de> Wed Nov 25 08:43:23 2020 +0100
committer Eike Stepper <stepper@esc-net.de> Wed Nov 25 08:43:23 2020 +0100
tree 218d4995f7ba259002af23d9938bd6410135d88b
parent 1b381cb40aac6e668c2ad19ea21e966fa50a00b1

[539021] ObjectNotFoundException when trying to prefetchLockState on non existing CDOObject for this view

https://bugs.eclipse.org/bugs/show_bug.cgi?id=539021

plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOLockStatePrefetcher.java

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOLockStatePrefetcher.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOLockStatePrefetcher.java
index 9022ac7..fbaa6f9 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOLockStatePrefetcher.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOLockStatePrefetcher.java
@@ -16,6 +16,7 @@
 import org.eclipse.emf.cdo.common.lock.CDOLockUtil;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
 import org.eclipse.emf.cdo.common.revision.CDORevisionsLoadedEvent;
+import org.eclipse.emf.cdo.util.ObjectNotFoundException;
 
 import org.eclipse.emf.internal.cdo.bundle.OM;
 import org.eclipse.emf.internal.cdo.view.CDOViewImpl;
@@ -170,10 +171,17 @@
               // either as it will create some load revisions request.
               boolean normalObject = !revision.isResourceNode();
 
-              CDOObject object = view.getObject(id, normalObject);
-              if (object != null)
+              try
               {
-                ids.add(id);
+                CDOObject object = view.getObject(id, normalObject);
+                if (object != null)
+                {
+                  ids.add(id);
+                }
+              }
+              catch (ObjectNotFoundException ex)
+              {
+                //$FALL-THROUGH$
               }
             }
           }
@@ -191,8 +199,18 @@
           List<CDOLockState> missingLockStates = new ArrayList<>();
           for (CDOID id : ids)
           {
-            CDOObject object = view.getObject(id, false);
-            addMissingLockState(object, missingLockStates);
+            try
+            {
+              CDOObject object = view.getObject(id, false);
+              if (object != null)
+              {
+                addMissingLockState(object, missingLockStates);
+              }
+            }
+            catch (ObjectNotFoundException ex)
+            {
+              //$FALL-THROUGH$
+            }
           }
 
           for (CDORevision revision : event.getAdditionalLoadedRevisions())
@@ -202,8 +220,18 @@
             {
               boolean normalObject = !revision.isResourceNode();
 
-              CDOObject object = view.getObject(id, normalObject);
-              addMissingLockState(object, missingLockStates);
+              try
+              {
+                CDOObject object = view.getObject(id, normalObject);
+                if (object != null)
+                {
+                  addMissingLockState(object, missingLockStates);
+                }
+              }
+              catch (ObjectNotFoundException ex)
+              {
+                //$FALL-THROUGH$
+              }
             }
           }
 
@@ -234,16 +262,16 @@
       }
     }
 
-    for (InternalCDOView otherview : view.getSession().getViews())
+    for (InternalCDOView otherView : view.getSession().getViews())
     {
       if (asyncUpdate)
       {
         ExecutorService executorService = view.getExecutorService();
-        executorService.submit(() -> updateLockStatesForOtherView(lockStates, loadOnDemand, otherview));
+        executorService.submit(() -> updateLockStatesForOtherView(lockStates, loadOnDemand, otherView));
       }
       else
       {
-        updateLockStatesForOtherView(lockStates, loadOnDemand, otherview);
+        updateLockStatesForOtherView(lockStates, loadOnDemand, otherView);
       }
     }
   }
@@ -252,7 +280,7 @@
   {
     try
     {
-      if (otherview != view && otherview.getBranch() == view.getBranch())
+      if (otherview != view && otherview.isActive() && otherview.getBranch() == view.getBranch())
       {
         otherview.updateLockStates(lockStates, loadOnDemand, null);
       }