sebb        2004/02/18 16:31:22

  Modified:    src/core/org/apache/jmeter/testelement
                        AbstractTestElement.java
  Log:
  Proper hashCode() does not work ...
  
  Revision  Changes    Path
  1.30      +17 -7     
jakarta-jmeter/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
  
  Index: AbstractTestElement.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/AbstractTestElement.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- AbstractTestElement.java  18 Feb 2004 22:43:34 -0000      1.29
  +++ AbstractTestElement.java  19 Feb 2004 00:31:22 -0000      1.30
  @@ -82,7 +82,7 @@
           propMap.remove(key);
       }
   
  -    public boolean equals(Object o) //TODO: probably ought to use hashCode() from 
Map as well
  +    public boolean equals(Object o)
       {
           if (o instanceof AbstractTestElement)
           {
  @@ -94,12 +94,22 @@
           }
       }
   
  -    // Ensure equals agrees with hash
  -    public int hashCode()
  -    {
  -     return propMap.hashCode();
  -     
  -    }
  +     /*
  +      * URGENT:
  +      * TODO - sort out equals and hashCode() - at present equal instances can/will 
have
  +      * different hashcodes - problem is, when a proper hashcode is used, tests 
stop working,
  +      * e.g. listener data disappears when switching views...
  +      * This presumably means that instances currently regarded as equal, aren't 
really equal...
  +      *  
  +      *  (non-Javadoc)
  +      * @see java.lang.Object#hashCode()
  +      */
  +// This would be sensible, but does not work:
  +//     public int hashCode()
  +//     {
  +//           return propMap.hashCode();
  +//     }
  +    
       public void addTestElement(TestElement el)
       {
           mergeIn(el);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to