[306047] NPE bringing up EJB 3.x bean wizards
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassDataModelProvider.java
index c889e54..94c7563 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassDataModelProvider.java
@@ -503,23 +503,26 @@
private boolean ejb31OrLater() {
boolean retVal = false;
IProject project = getTargetProject();
- if (JavaEEProjectUtilities.isEJBProject(project))
+ if (project != null)
{
- IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.EJB);
- int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
- retVal = version >= J2EEVersionConstants.VERSION_3_1;
- }
- else if (JavaEEProjectUtilities.isDynamicWebProject(project))
- {
- IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.DYNAMIC_WEB);
- int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
- retVal = version >= J2EEVersionConstants.VERSION_3_0;
- }
- else if (JavaEEProjectUtilities.isWebFragmentProject(project))
- {
- IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.WEBFRAGMENT);
- int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
- retVal = version >= J2EEVersionConstants.VERSION_3_0;
+ if (JavaEEProjectUtilities.isEJBProject(project))
+ {
+ IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.EJB);
+ int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
+ retVal = version >= J2EEVersionConstants.VERSION_3_1;
+ }
+ else if (JavaEEProjectUtilities.isDynamicWebProject(project))
+ {
+ IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.DYNAMIC_WEB);
+ int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
+ retVal = version >= J2EEVersionConstants.VERSION_3_0;
+ }
+ else if (JavaEEProjectUtilities.isWebFragmentProject(project))
+ {
+ IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.WEBFRAGMENT);
+ int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
+ retVal = version >= J2EEVersionConstants.VERSION_3_0;
+ }
}
return retVal;
}
