This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository stapler.
commit 234c22eeccce96b6e238ead6e02e7c94c19c5eaa Author: Markus Koschany <[email protected]> Date: Fri Apr 15 23:23:59 2016 +0200 Update 0005-revert-kohsuke-asm5.patch --- debian/patches/0005-revert-kohsuke-asm5.patch | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/debian/patches/0005-revert-kohsuke-asm5.patch b/debian/patches/0005-revert-kohsuke-asm5.patch index 592fc70..ae21521 100644 --- a/debian/patches/0005-revert-kohsuke-asm5.patch +++ b/debian/patches/0005-revert-kohsuke-asm5.patch @@ -3,11 +3,11 @@ Date: Fri, 15 Apr 2016 22:58:50 +0200 Subject: 0005 revert kohsuke asm5 --- - core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) + .../java/org/kohsuke/stapler/ClassDescriptor.java | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java b/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java -index ca0b5a1..c782d42 100644 +index ca0b5a1..50ce810 100644 --- a/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java +++ b/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java @@ -25,11 +25,11 @@ package org.kohsuke.stapler; @@ -36,3 +36,19 @@ index ca0b5a1..c782d42 100644 /** * Reflection information of a {@link Class}. +@@ -151,10 +151,12 @@ public final class ClassDescriptor { + java.lang.reflect.Type[] paramTypes = m.getGenericParameterTypes(); + Class[] erasedParamTypes = new Class[paramTypes.length]; + for (int i = 0; i < paramTypes.length; i++) { +- if (logical instanceof ParameterizedType) +- erasedParamTypes[i] = Types.erasure(Types.bind(paramTypes[i], c, (ParameterizedType)logical)); +- else ++ if (logical instanceof ParameterizedType) { ++ //erasedParamTypes[i] = Types.erasure(Types.bind(paramTypes[i], c, (ParameterizedType)logical)); ++ } ++ else { + erasedParamTypes[i] = Types.erasure(paramTypes[i]); ++ } + } + + result.add(new MethodMirror(new Signature(m.getName(), erasedParamTypes), m)); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/stapler.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
