[jboss-cvs] javassist/src/main/javassist/util/proxy ...

[Shigeru Chiba]

  User: chiba   
  Date: 06/11/06 23:19:37

  Modified:    src/main/javassist/util/proxy  ProxyFactory.java
  Log:
  Fixed a bug of duplicating writeReplace() to a proxy class.
  
  Revision  Changes    Path
  1.21      +6 -1      javassist/src/main/javassist/util/proxy/ProxyFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ProxyFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/util/proxy/ProxyFactory.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- ProxyFactory.java	5 Nov 2006 23:16:35 -0000	1.20
  +++ ProxyFactory.java	7 Nov 2006 04:19:37 -0000	1.21
  @@ -512,7 +512,12 @@
           addMethodsHolder(cf, pool, classname, s);
           addSetter(classname, cf, pool);
   
  +        try {
           cf.addMethod(makeWriteReplace(pool));
  +        }
  +        catch (DuplicateMemberException e) {
  +            // writeReplace() is already declared in the super class/interfaces.
  +        }
   
           thisClass = null;          
           return cf;