[libxbean-java] 01/03: Fixed a ClassNotFoundException in AsmParameterNameLoader (Closes: #789518)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libxbean-java.

commit 2599205eb2ceba94f184326ce34618b9ff3115af
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Aug 7 13:07:52 2015 +0200

    Fixed a ClassNotFoundException in AsmParameterNameLoader (Closes: #789518)
---
 debian/changelog                     |  7 ++++++
 debian/patches/bootstrap.series      |  1 +
 debian/patches/fix-asm-visitor.patch | 41 ++++++++++++++++++++++++++++++++++++
 debian/patches/full.series           |  1 +
 4 files changed, 50 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 69ea26e..2c293b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxbean-java (4.3-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed a ClassNotFoundException in AsmParameterNameLoader (Closes: #789518)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 07 Aug 2015 13:06:30 +0200
+
 libxbean-java (4.3-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/bootstrap.series b/debian/patches/bootstrap.series
index 093e9f7..ae7e6d1 100644
--- a/debian/patches/bootstrap.series
+++ b/debian/patches/bootstrap.series
@@ -2,3 +2,4 @@ bootstrap.diff
 bundle.diff
 modules.diff
 DelegatingBundleContext.patch
+fix-asm-visitor.patch
diff --git a/debian/patches/fix-asm-visitor.patch b/debian/patches/fix-asm-visitor.patch
new file mode 100644
index 0000000..20bd09a
--- /dev/null
+++ b/debian/patches/fix-asm-visitor.patch
@@ -0,0 +1,41 @@
+Description: Replace EmptyVisitor with ClassVisitor in AsmParameterNameLoader to fix a ClassNotFoundException
+Author: Emmanuel Bourg <ebourg at apache.org>
+Bug: https://github.com/apache/geronimo-xbean/pull/12
+Bug-Debian: https://bugs.debian.org/789518
+--- a/xbean-reflect/src/main/java/org/apache/xbean/recipe/AsmParameterNameLoader.java
++++ b/xbean-reflect/src/main/java/org/apache/xbean/recipe/AsmParameterNameLoader.java
+@@ -17,8 +17,8 @@
+  */
+ package org.apache.xbean.recipe;
+ 
+-import org.apache.xbean.asm5.original.commons.EmptyVisitor;
+ import org.objectweb.asm.ClassReader;
++import org.objectweb.asm.ClassVisitor;
+ import org.objectweb.asm.Label;
+ import org.objectweb.asm.MethodVisitor;
+ import org.objectweb.asm.Opcodes;
+@@ -211,7 +211,7 @@
+         }
+     }
+ 
+-    private static class AllParameterNamesDiscoveringVisitor extends EmptyVisitor {
++    private static class AllParameterNamesDiscoveringVisitor extends ClassVisitor {
+         private final Map<Constructor,List<String>> constructorParameters = new HashMap<Constructor,List<String>>();
+         private final Map<Method,List<String>> methodParameters = new HashMap<Method,List<String>>();
+         private final Map<String,Exception> exceptions = new HashMap<String,Exception>();
+@@ -220,6 +220,7 @@
+         private final Map<String,Constructor> constructorMap = new HashMap<String,Constructor>();
+ 
+         public AllParameterNamesDiscoveringVisitor(Class type, String methodName) {
++            super(Opcodes.ASM5);
+             this.methodName = methodName;
+ 
+             List<Method> methods = new ArrayList<Method>(Arrays.asList(type.getMethods()));
+@@ -232,6 +233,7 @@
+         }
+ 
+         public AllParameterNamesDiscoveringVisitor(Class type) {
++            super(Opcodes.ASM5);
+             this.methodName = "<init>";
+ 
+             List<Constructor> constructors = new ArrayList<Constructor>(Arrays.asList(type.getConstructors()));
diff --git a/debian/patches/full.series b/debian/patches/full.series
index fe5c167..6ec746c 100644
--- a/debian/patches/full.series
+++ b/debian/patches/full.series
@@ -1,3 +1,4 @@
 bundle.diff
 modules.diff
 DelegatingBundleContext.patch
+fix-asm-visitor.patch

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