[pkg-java] r18049 - in trunk/libjibx-java/branch-1.1/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-04-17 15:41:40 +0000 (Thu, 17 Apr 2014)
New Revision: 18049

Added:
   trunk/libjibx-java/branch-1.1/debian/patches/02_java8_compatibility.patch
Modified:
   trunk/libjibx-java/branch-1.1/debian/changelog
   trunk/libjibx-java/branch-1.1/debian/patches/series
Log:
Fixed a NPE in ClassHierarchyContext with Java 8



Modified: trunk/libjibx-java/branch-1.1/debian/changelog
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/changelog	2014-04-17 15:16:54 UTC (rev 18048)
+++ trunk/libjibx-java/branch-1.1/debian/changelog	2014-04-17 15:41:40 UTC (rev 18049)
@@ -1,6 +1,7 @@
 libjibx1.1-java (1.1.6a-5) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed a NPE in ClassHierarchyContext with Java 8
   * Enabled the debug symbols in the compiled classes
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)

Added: trunk/libjibx-java/branch-1.1/debian/patches/02_java8_compatibility.patch
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/patches/02_java8_compatibility.patch	                        (rev 0)
+++ trunk/libjibx-java/branch-1.1/debian/patches/02_java8_compatibility.patch	2014-04-17 15:41:40 UTC (rev 18049)
@@ -0,0 +1,39 @@
+Description: Fixes a NPE in ClassHierarchyContext with Java 8
+Author: Emmanuel Bourg <ebourg at pache.org>
+Forwarded: no
+--- a/build/src/org/jibx/binding/model/ClassHierarchyContext.java
++++ b/build/src/org/jibx/binding/model/ClassHierarchyContext.java
+@@ -85,6 +85,7 @@
+      * @param intfset set of interfaces
+      */
+     private void accumulateInterfaces(IClass clas, Set intfset) {
++        if (clas == null) return;
+         String[] interfaces = clas.getInterfaces();
+         for (int i = 0; i < interfaces.length; i++) {
+             String name = interfaces[i];
+@@ -221,4 +222,4 @@
+             return false;
+         }
+     }
+-}
+\ No newline at end of file
++}
+--- a/build/src/org/jibx/binding/classes/ClassFile.java
++++ b/build/src/org/jibx/binding/classes/ClassFile.java
+@@ -326,8 +326,7 @@
+                 m_curClass = parser.parse();
+                 m_interfaceNames = m_curClass.getInterfaceNames();
+             } catch (Exception ex) {
+-                throw new JiBXException("Error reading path " +
+-                    path + " for class " + name);
++                throw (JiBXException) new JiBXException("Error reading path " + path + " for class " + name).initCause(ex);
+             }
+         }
+         initInterface();
+@@ -2069,4 +2068,4 @@
+             return null;
+         }
+     }
+-}
+\ No newline at end of file
++}

Modified: trunk/libjibx-java/branch-1.1/debian/patches/series
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/patches/series	2014-04-17 15:16:54 UTC (rev 18048)
+++ trunk/libjibx-java/branch-1.1/debian/patches/series	2014-04-17 15:41:40 UTC (rev 18049)
@@ -1 +1,2 @@
 01_build_xml.patch
+02_java8_compatibility.patch