Author: ebourg-guest Date: 2013-07-04 10:38:32 +0000 (Thu, 04 Jul 2013) New Revision: 16986
Added: trunk/antlr-maven-plugin/debian/patches/null-options-check.patch Modified: trunk/antlr-maven-plugin/debian/changelog trunk/antlr-maven-plugin/debian/patches/series Log: Added a patch to fix a NPE when the grammar options are null (http://jira.codehaus.org/browse/MANTLR-34) Modified: trunk/antlr-maven-plugin/debian/changelog =================================================================== --- trunk/antlr-maven-plugin/debian/changelog 2013-07-03 14:48:21 UTC (rev 16985) +++ trunk/antlr-maven-plugin/debian/changelog 2013-07-04 10:38:32 UTC (rev 16986) @@ -1,3 +1,10 @@ +antlr-maven-plugin (2.2-2) unstable; urgency=low + + * Added a patch to fix a NPE when the grammar options are null + (http://jira.codehaus.org/browse/MANTLR-34) + + -- Emmanuel Bourg <[email protected]> Thu, 04 Jul 2013 10:27:52 +0200 + antlr-maven-plugin (2.2-1) unstable; urgency=low * New upstream release Added: trunk/antlr-maven-plugin/debian/patches/null-options-check.patch =================================================================== --- trunk/antlr-maven-plugin/debian/patches/null-options-check.patch (rev 0) +++ trunk/antlr-maven-plugin/debian/patches/null-options-check.patch 2013-07-04 10:38:32 UTC (rev 16986) @@ -0,0 +1,15 @@ +Description: Fixed a NPE when the grammar options are null +Author: Emmanuel Bourg <[email protected]> +Forwarded: yes +Bug: http://jira.codehaus.org/browse/MANTLR-34 +--- a/src/main/java/org/codehaus/mojo/antlr/metadata/MetadataExtracter.java ++++ b/src/main/java/org/codehaus/mojo/antlr/metadata/MetadataExtracter.java +@@ -239,6 +239,8 @@ + Method getRHSMethod = helper.getAntlrOptionClass().getMethod( "getRHS", Helper.NO_ARG_SIGNATURE ); + getRHSMethod.setAccessible( true ); + ++ if (options == null) return; ++ + Object importVocabOption = getElementMethod.invoke( options, new Object[] { "importVocab" } ); + if ( importVocabOption != null ) + { Modified: trunk/antlr-maven-plugin/debian/patches/series =================================================================== --- trunk/antlr-maven-plugin/debian/patches/series 2013-07-03 14:48:21 UTC (rev 16985) +++ trunk/antlr-maven-plugin/debian/patches/series 2013-07-04 10:38:32 UTC (rev 16986) @@ -1 +1,2 @@ +null-options-check.patch modello-1.1.patch _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
