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

[Shigeru Chiba]

  User: chiba   
  Date: 08/03/19 15:06:05

  Modified:    src/main/javassist/bytecode/annotation  Annotation.java
  Log:
  fixed JASSIST-56
  
  Revision  Changes    Path
  1.9       +10 -5     javassist/src/main/javassist/bytecode/annotation/Annotation.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Annotation.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/bytecode/annotation/Annotation.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- Annotation.java	2 Feb 2007 10:52:45 -0000	1.8
  +++ Annotation.java	19 Mar 2008 19:06:05 -0000	1.9
  @@ -332,10 +332,15 @@
           if (getTypeName().equals(other.getTypeName()) == false)
               return false;
   
  -        if (members == null && other.members != null)
  +        HashMap otherMembers = other.members;
  +        if (members == otherMembers)
  +            return true;
  +        else if (members == null)
  +            return otherMembers == null;
  +        else
  +            if (otherMembers == null)
              return false;
  -        if (members != null && other.members == null)
  -           return false;
  -        return members.equals(other.members);
  +            else
  +                return members.equals(otherMembers);
       }
   }