commit d284511c6b9e9defcea444bf456ea0ea773e62ff
author John Collier <John.J.Collier@ibm.com> Thu Feb 08 13:52:48 2018 -0500
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> Thu Feb 08 13:52:48 2018 -0500
tree 03d9459833d134cfd7514b9a66277d63dcabc880
parent 81669b0052d1d5e39d33d4703f05b16e9195e86b
parent 340aec38099115145bb2e9140bd378a79922a66d

Merge "[510682] Adds check for Dynamic Web facet before version check "

plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationReader.java

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;
 	}