Fixed bug 1566547 - Annotations with an empty MemberValueArrayInitializer are now parsed properly.

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@4666 51baf565-9d33-0410-a72c-fc3788e3496d

pmd/etc/changelog.txt

@@ -7,6 +7,7 @@ Fixed bug 1571324 - UselessStringValueOf no longer reports a false positive for
 Fixed bug 1573795 - PreserveStackTrace doesn't throw CastClassException on exception with 0 args
 Fixed bug 1573591 - NonThreadSafeSingleton doesn't throw NPE when using this keyword
 Fixed bug 1371753 - UnnecessaryLocalBeforeReturn is now less aggressive in its reporting.
+Fixed bug 1566547 - Annotations with an empty MemberValueArrayInitializer are now parsed properly.
 Applied patch 1551189 - SingularField false + for initialization blocks
 Applied patch 1573981 - false + in CloneMethodMustImplementCloneable
 Applied patch 1574988 - false + in OverrideBothEqualsAndHashcode

pmd/etc/grammar/Java.jjt

@@ -2014,7 +2014,7 @@ void MemberValue():
 void  MemberValueArrayInitializer():
 {}
 {
-  "{" MemberValue() ( LOOKAHEAD(2) "," MemberValue() )* [ "," ] "}"
+  "{" (MemberValue() ( LOOKAHEAD(2) "," MemberValue() )* [ "," ])? "}"
 }
 
 

pmd/xdocs/credits.xml

@@ -52,7 +52,8 @@
         </subsection>
         <subsection name="Contributors">
         <ul>
-            <li>A.M. Berg - Reported bug in Ant task</li>
+            <li>Josh Devins - Reported bug with annotation parsing</li>
+            <li>Alan Berg - Reported bug in Ant task</li>
             <li>Jason Bennett - Fix for UnnecessaryLocalBeforeReturn, wrote NPathComplexity rule, patches to improve CyclomaticComplexity rule</li>
             <li>Brent Fisher - SummaryHTML report improvements</li>
             <li>George Thomas - Wrote AvoidRethrowingException rule</li>