[antlr3.2] 33/46: Fixed a NullPointerException in CompositeGrammar.getIndirectDelegates() with Java 8

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository antlr3.2.

commit 3793746bc7643267c84745d0c5087a83d0b83f64
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Apr 7 12:10:18 2014 +0000

    Fixed a NullPointerException in CompositeGrammar.getIndirectDelegates() with Java 8
---
 debian/changelog                  |  2 ++
 debian/patches/java8-compat.patch | 14 ++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d899acb..d984e0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 antlr3 (3.2-10) UNRELEASED; urgency=medium
 
+  * Fixed a NullPointerException in CompositeGrammar.getIndirectDelegates()
+    with Java 8
   * Standards-Version updated to 3.9.5 (no changes)
   * Switch to debhelper level 9
 
diff --git a/debian/patches/java8-compat.patch b/debian/patches/java8-compat.patch
new file mode 100644
index 0000000..a7f3fda
--- /dev/null
+++ b/debian/patches/java8-compat.patch
@@ -0,0 +1,14 @@
+Description: Fixes a NullPointerException in CompositeGrammar.getIndirectDelegates() with Java 8
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
++++ b/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
+@@ -219,7 +219,7 @@
+ 	public List<Grammar> getIndirectDelegates(Grammar g) {
+ 		List<Grammar> direct = getDirectDelegates(g);
+ 		List<Grammar> delegates = getDelegates(g);
+-		delegates.removeAll(direct);
++		if (direct != null) delegates.removeAll(direct);
+ 		return delegates;
+ 	}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3d96cba..e071037 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 java7-compat.patch
+java8-compat.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/antlr3.2.git