You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xbean-scm@geronimo.apache.org by rm...@apache.org on 2014/05/20 19:46:34 UTC

svn commit: r1596338 - /geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java

Author: rmannibucau
Date: Tue May 20 17:46:34 2014
New Revision: 1596338

URL: http://svn.apache.org/r1596338
Log:
XBEAN-265 patch from Matt Benson, fixing descriptor for MethodInfo build from reflection

Modified:
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java?rev=1596338&r1=1596337&r2=1596338&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java (original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java Tue May 20 17:46:34 2014
@@ -1447,14 +1447,14 @@ public class AnnotationFinder implements
             super(constructor);
             this.declaringClass = info;
             this.name = "<init>";
-            this.descriptor = null;
+            this.descriptor = Type.getConstructorDescriptor(constructor);
         }
 
         public MethodInfo(ClassInfo info, Method method) {
             super(method);
             this.declaringClass = info;
             this.name = method.getName();
-            this.descriptor = method.getReturnType().getName();
+            this.descriptor = Type.getMethodDescriptor(method);
             this.method = method;
         }
 
@@ -1464,6 +1464,10 @@ public class AnnotationFinder implements
             this.descriptor = descriptor;
         }
 
+        public String getDescriptor() {
+            return descriptor;
+        }
+
         @Override
         public String getMetaAnnotationName() {
             return declaringClass.getMetaAnnotationName();