src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java

@  rev 3601 : 8061305: Javadoc crashes when method name ends with "Property"
|  Reviewed-by: jjg
~

@@ -662,10 +662,13 @@
         }
 
         // properties aren't named setA* or getA*
         private final Pattern pattern = Pattern.compile("[sg]et\\p{Upper}.*");
         private boolean isPropertyMethod(MethodDoc method) {
+            if (!configuration.javafx) {
+               return false;
+            }
             if (!method.name().endsWith("Property")) {
                 return false;
             }
 
             if (! memberIsVisible(method)) {

@@ -673,11 +676,13 @@
             }
 
             if (pattern.matcher(method.name()).matches()) {
                 return false;
             }
-
+            if (method.typeParameters().length > 0) {
+                return false;
+            }
             return 0 == method.parameters().length
                     && !"void".equals(method.returnType().simpleTypeName());
         }
 
         private void checkOnPropertiesTags(MethodDoc[] members) {