[510682] Adds check for Dynamic Web facet before version check In the WebAnnotationReader.analyzeCompilationUnit function, there is a check to see what version of the Dynamic Web facet is installed in a project without checking to see if the facet is even installed. A simple solution is to add a check to see if the facet is installed, before checking the version, like what was done in Web25MergedModelProvider.createWebMerger. Signed-off-by: John Collier <John.J.Collier@ibm.com>
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationReader.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationReader.java index 75908ad..204df13 100644 --- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationReader.java +++ b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationReader.java
@@ -141,9 +141,13 @@ return annotationFactory.createFilter(rootType, filter.getFilterName()); } } - if(Float.parseFloat(facetedProject.getProjectFacetVersion(WebFacetUtils.WEB_FACET).getVersionString()) > 2.5){ - return createJavaeeObject(rootType); + + if (facetedProject.hasProjectFacet(WebFacetUtils.WEB_FACET)) { + if (Float.parseFloat(facetedProject.getProjectFacetVersion(WebFacetUtils.WEB_FACET).getVersionString()) > 2.5){ + return createJavaeeObject(rootType); + } } + return null; }