Jira-ID: CRNT-26325

Interactive application type: Change any interactive application to ExternalWebApp and click on Typed Access Points leads to NPE 

git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@59707 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

1 files changed, 9 insertions, 0 deletions

diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/ModelUtils.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/ModelUtils.java
index b91bd22..e528887 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/ModelUtils.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/util/ModelUtils.java
@@ -65,6 +65,7 @@ import org.eclipse.stardust.model.xpdl.carnot.ApplicationTypeType;
 import org.eclipse.stardust.model.xpdl.carnot.AttributeType;
 import org.eclipse.stardust.model.xpdl.carnot.CarnotWorkflowModelFactory;
 import org.eclipse.stardust.model.xpdl.carnot.CarnotWorkflowModelPackage;
+import org.eclipse.stardust.model.xpdl.carnot.ContextType;
 import org.eclipse.stardust.model.xpdl.carnot.DataMappingType;
 import org.eclipse.stardust.model.xpdl.carnot.DataType;
 import org.eclipse.stardust.model.xpdl.carnot.DescriptionType;
@@ -750,6 +751,14 @@ public class ModelUtils
    // TODO: duplicate method VersionRepository, need to put it in a common place
    public static IProject getProjectFromEObject(EObject eObject)
    {
+      if (eObject instanceof ContextType)
+      {
+         ContextType contextType = (ContextType) eObject;
+         if (contextType.getType() != null)
+         {
+            eObject = contextType.getType().eContainer();
+         }
+      }
       if (eObject != null)
       {
          Resource eResource = eObject.eResource();