[511087] NullPointerException thrown in
GenModelImpl.sameModelTestsProject
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelImpl.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelImpl.java
index cac41fe..a331ba7 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelImpl.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelImpl.java
@@ -7826,17 +7826,17 @@
{
// Different than the Edit and Editor projects, this method is invoked while
// generating the model plugin xml.
- return getTestsDirectory() == null ? false : getModelProjectDirectory().equals(getTestsProjectDirectory());
+ return getTestsDirectory() == null ? false : getModelProjectDirectory() != null && getModelProjectDirectory().equals(getTestsProjectDirectory());
}
public boolean sameEditTestsProject()
{
- return getTestsDirectory() == null ? false : getEditProjectDirectory().equals(getTestsProjectDirectory());
+ return getTestsDirectory() == null ? false : getEditProjectDirectory() != null && getEditProjectDirectory().equals(getTestsProjectDirectory());
}
public boolean sameEditorTestsProject()
{
- return getTestsDirectory() == null ? false : getEditorProjectDirectory().equals(getTestsProjectDirectory());
+ return getTestsDirectory() == null ? false : getEditorProjectDirectory() != null && getEditorProjectDirectory().equals(getTestsProjectDirectory());
}
public String getEditIconsDirectory()
