[antlr-maven-plugin] 15/23: Added a patch to fix a NPE when the grammar options are null (http://jira.codehaus.org/browse/MANTLR-34)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository antlr-maven-plugin.

commit bf2211c224aea261f413c2767031e2bfff965a17
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 4 10:38:32 2013 +0000

    Added a patch to fix a NPE when the grammar options are null (http://jira.codehaus.org/browse/MANTLR-34)
---
 debian/changelog                        |  7 +++++++
 debian/patches/null-options-check.patch | 15 +++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3d4652f..44d1f43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <ebourg at apache.org>  Thu, 04 Jul 2013 10:27:52 +0200
+
 antlr-maven-plugin (2.2-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/null-options-check.patch b/debian/patches/null-options-check.patch
new file mode 100644
index 0000000..cce35d5
--- /dev/null
+++ b/debian/patches/null-options-check.patch
@@ -0,0 +1,15 @@
+Description: Fixed a NPE when the grammar options are null
+Author: Emmanuel Bourg <ebourg at apache.org>
+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 )
+             {
diff --git a/debian/patches/series b/debian/patches/series
index bb98abd..ac07961 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+null-options-check.patch
 modello-1.1.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/antlr-maven-plugin.git