Bug 377405 - [hotbug] FaceletHTMLValidator is slow on some files

1 files changed, 7 insertions, 3 deletions

diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/JSFResourceBasedTagRecord.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/JSFResourceBasedTagRecord.java
index a15276e70..5ff74a718 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/JSFResourceBasedTagRecord.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/JSFResourceBasedTagRecord.java
@@ -170,9 +170,13 @@ public class JSFResourceBasedTagRecord extends FaceletTagRecord
                 case CHANGED:
                     // only add to the list on a add/change if the resource
                     // exists and is the right type
-                    if (jsfResource.isAccessible()
-                            && jsfResource
-                                    .isContentType(FACELET_FILE_CONTENT_TYPE))
+                	// Bug 377405: order the isContentType call first because
+                	// it has a high probability of returning false and
+                	// short-circuiting the isAccessible call that can
+                	// be very expensive (10-100 times)
+                    if (jsfResource
+                                    .isContentType(FACELET_FILE_CONTENT_TYPE)
+                                    && jsfResource.isAccessible())
                     {
                         tags.addTag(tag);
                     }