[365585] Guard against null EObject when finding the editing domain.

1 files changed, 21 insertions, 18 deletions

diff --git a/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/domain/AdapterFactoryEditingDomain.java b/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/domain/AdapterFactoryEditingDomain.java
index 85974ae26..7088e656d 100644
--- a/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/domain/AdapterFactoryEditingDomain.java
+++ b/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/domain/AdapterFactoryEditingDomain.java
@@ -12,7 +12,7 @@
  *
  * </copyright>
  *
- * $Id: AdapterFactoryEditingDomain.java,v 1.30 2011/10/27 17:03:38 emerks Exp $
+ * $Id: AdapterFactoryEditingDomain.java,v 1.31 2011/12/05 14:40:31 emerks Exp $
  */
 package org.eclipse.emf.edit.domain;
 
@@ -173,29 +173,32 @@ public class AdapterFactoryEditingDomain implements EditingDomain
    */
   static public EditingDomain getEditingDomainFor(EObject object)
   {
-    Resource resource = object.eResource();
-    if (resource != null)
+    if (object != null)
     {
-      IEditingDomainProvider editingDomainProvider =
-        (IEditingDomainProvider)EcoreUtil.getExistingAdapter(resource, IEditingDomainProvider.class);
-      if (editingDomainProvider != null)
-      {
-        return editingDomainProvider.getEditingDomain();
-      }
-      else
+      Resource resource = object.eResource();
+      if (resource != null)
       {
-        ResourceSet resourceSet = resource.getResourceSet();
-        if (resourceSet instanceof IEditingDomainProvider)
+        IEditingDomainProvider editingDomainProvider =
+          (IEditingDomainProvider)EcoreUtil.getExistingAdapter(resource, IEditingDomainProvider.class);
+        if (editingDomainProvider != null)
         {
-          EditingDomain editingDomain = ((IEditingDomainProvider)resourceSet).getEditingDomain();
-          return editingDomain;
+          return editingDomainProvider.getEditingDomain();
         }
-        else if (resourceSet != null)
+        else
         {
-          editingDomainProvider = (IEditingDomainProvider)EcoreUtil.getExistingAdapter(resourceSet, IEditingDomainProvider.class);
-          if (editingDomainProvider != null)
+          ResourceSet resourceSet = resource.getResourceSet();
+          if (resourceSet instanceof IEditingDomainProvider)
           {
-            return editingDomainProvider.getEditingDomain();
+            EditingDomain editingDomain = ((IEditingDomainProvider)resourceSet).getEditingDomain();
+            return editingDomain;
+          }
+          else if (resourceSet != null)
+          {
+            editingDomainProvider = (IEditingDomainProvider)EcoreUtil.getExistingAdapter(resourceSet, IEditingDomainProvider.class);
+            if (editingDomainProvider != null)
+            {
+              return editingDomainProvider.getEditingDomain();
+            }
           }
         }
       }