svn commit: r612893 - in /wicket/trunk/jdk-1.4/wicket/src: main/java/org/apache/wicket/util/string/PrependingStringBuffer.java test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java

[ivaynberg]

Author: ivaynberg
Date: Thu Jan 17 09:57:14 2008
New Revision: 612893

URL: http://svn.apache.org/viewvc?rev=612893&view=rev
Log:
WICKET-1290 PrependingStringBuffer.equals(Object obj) is not reflexive

Modified:
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/PrependingStringBuffer.java
    
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/PrependingStringBuffer.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/PrependingStringBuffer.java?rev=612893&r1=612892&r2=612893&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/PrependingStringBuffer.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/PrependingStringBuffer.java
 Thu Jan 17 09:57:14 2008
@@ -140,6 +140,18 @@
 
        public boolean equals(Object obj)
        {
-               return toString().equals(obj);
+               if (obj == this)
+               {
+                       return true;
+               }
+               else if (obj == null)
+               {
+                       return false;
+               }
+               else
+               {
+                       return toString().equals(obj.toString());
+               }
+
        }
 }

Modified: 
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java?rev=612893&r1=612892&r2=612893&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java
 Thu Jan 17 09:57:14 2008
@@ -56,4 +56,19 @@
                psb.prepend('1');
                assertEquals("1234567890", psb.toString());
        }
+
+       /**
+        * Test <a
+        * 
href="http://java.sun.com/j2se/1.5.0/docs/api/java/lang/Object.html#equals(java.lang.Object)">reflexivity<a>
+        * of the equals implementation.
+        * 
+        * @throws Exception
+        */
+       public void testEqualsReflexive() throws Exception
+       {
+               PrependingStringBuffer psb = new PrependingStringBuffer("foo");
+               assertTrue(psb.equals(psb));
+       }
+
+
 }