[pkg-java] r18000 - in trunk/antlr3/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-04-07 12:10:18 +0000 (Mon, 07 Apr 2014)
New Revision: 18000

Added:
   trunk/antlr3/debian/patches/java8-compat.patch
Modified:
   trunk/antlr3/debian/changelog
   trunk/antlr3/debian/patches/series
Log:
Fixed a NullPointerException in CompositeGrammar.getIndirectDelegates() with Java 8



Modified: trunk/antlr3/debian/changelog
===================================================================
--- trunk/antlr3/debian/changelog	2014-04-07 06:53:08 UTC (rev 17999)
+++ trunk/antlr3/debian/changelog	2014-04-07 12:10:18 UTC (rev 18000)
@@ -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
 

Added: trunk/antlr3/debian/patches/java8-compat.patch
===================================================================
--- trunk/antlr3/debian/patches/java8-compat.patch	                        (rev 0)
+++ trunk/antlr3/debian/patches/java8-compat.patch	2014-04-07 12:10:18 UTC (rev 18000)
@@ -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;
+ 	}
+ 

Modified: trunk/antlr3/debian/patches/series
===================================================================
--- trunk/antlr3/debian/patches/series	2014-04-07 06:53:08 UTC (rev 17999)
+++ trunk/antlr3/debian/patches/series	2014-04-07 12:10:18 UTC (rev 18000)
@@ -1 +1,2 @@
 java7-compat.patch
+java8-compat.patch