[jboss-cvs] javassist/src/main/javassist/bytecode/annotation ...

[Shigeru Chiba]

  User: chiba   
  Date: 08/06/13 06:31:55

  Modified:    src/main/javassist/bytecode/annotation  AnnotationImpl.java
  Log:
  for 3.8.0.GA release
  
  Revision  Changes    Path
  1.15      +3 -3      javassist/src/main/javassist/bytecode/annotation/AnnotationImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AnnotationImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/bytecode/annotation/AnnotationImpl.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- AnnotationImpl.java	4 Jun 2007 03:11:10 -0000	1.14
  +++ AnnotationImpl.java	13 Jun 2008 10:31:55 -0000	1.15
  @@ -48,7 +48,7 @@
           // Try to resolve the JDK annotation type method
           try {
               Class clazz = Class.forName(JDK_ANNOTATION_CLASS_NAME);
  -            JDK_ANNOTATION_TYPE_METHOD = clazz.getMethod("annotationType", null);
  +            JDK_ANNOTATION_TYPE_METHOD = clazz.getMethod("annotationType", (Class[])null);
           }
           catch (Exception ignored) {
               // Probably not JDK5+
  @@ -243,7 +243,7 @@
               }
           }
   
  -        Class otherAnnotationType = (Class) JDK_ANNOTATION_TYPE_METHOD.invoke(obj, null);
  +        Class otherAnnotationType = (Class) JDK_ANNOTATION_TYPE_METHOD.invoke(obj, (Object[])null);
           if (getAnnotationType().equals(otherAnnotationType) == false)
              return false;
           
  @@ -260,7 +260,7 @@
                      value = mv.getValue(classLoader, pool, methods[i]);
                  if (value == null)
                      value = getDefault(name, methods[i]);
  -               otherValue = methods[i].invoke(obj, null);
  +               otherValue = methods[i].invoke(obj, (Object[])null);
               }
               catch (RuntimeException e) {
                   throw e;