diff options
| author | John Collier | 2018-02-08 18:52:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2018-02-08 18:52:48 +0000 |
| commit | d284511c6b9e9defcea444bf456ea0ea773e62ff (patch) | |
| tree | 03d9459833d134cfd7514b9a66277d63dcabc880 | |
| parent | 81669b0052d1d5e39d33d4703f05b16e9195e86b (diff) | |
| parent | 340aec38099115145bb2e9140bd378a79922a66d (diff) | |
| download | webtools.javaee-d284511c6b9e9defcea444bf456ea0ea773e62ff.tar.gz webtools.javaee-d284511c6b9e9defcea444bf456ea0ea773e62ff.tar.xz webtools.javaee-d284511c6b9e9defcea444bf456ea0ea773e62ff.zip | |
Merge "[510682] Adds check for Dynamic Web facet before version check "
| -rw-r--r-- | plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationReader.java | 8 |
1 files changed, 6 insertions, 2 deletions
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 75908adad..204df132a 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 @@ public class WebAnnotationReader extends AbstractAnnotationModelProvider<WebApp> 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; } |