2 files changed, 15 insertions, 22 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java b/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
index 1381390640..b577c916c6 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
@@ -461,26 +461,15 @@ public final class AMQShortString implements CharSequence, Comparable<AMQShortSt
     public boolean equals(Object o)
     {
 
-
-        if(o instanceof AMQShortString)
-        {
-            return equals((AMQShortString)o);
-        }
-        if(o instanceof CharSequence)
-        {
-            return equals((CharSequence)o);
-        }
-
-        if (o == null)
-        {
-            return false;
-        }
-
         if (o == this)
         {
             return true;
         }
 
+        if(o instanceof AMQShortString)
+        {
+            return equals((AMQShortString) o);
+        }
 
         return false;
 
@@ -544,11 +533,11 @@ public final class AMQShortString implements CharSequence, Comparable<AMQShortSt
 
     }
 
-    public boolean equals(CharSequence s)
+    public boolean equalsCharSequence(CharSequence s)
     {
         if(s instanceof AMQShortString)
         {
-            return equals((AMQShortString)s);
+            return equals((AMQShortString) s);
         }
 
         if (s == null)
@@ -602,7 +591,11 @@ public final class AMQShortString implements CharSequence, Comparable<AMQShortSt
 
     public int compareTo(AMQShortString name)
     {
-        if (name == null)
+        if(name == this)
+        {
+            return 0;
+        }
+        else if (name == null)
         {
             return 1;
         }
diff --git a/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java b/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
index bcdabfcb3f..0f8fbf0685 100644
--- a/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
+++ b/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
@@ -126,7 +126,7 @@ public class AMQShortStringTest extends TestCase
         }
         AMQShortString string = new AMQShortString(bytes);
         assertEquals("constructed amq short string length differs from expected", 4, string.length());
-        assertTrue("constructed amq short string differs from expected", string.equals("test"));
+        assertTrue("constructed amq short string differs from expected", string.equalsCharSequence("test"));
     }
 
     /**
@@ -139,7 +139,7 @@ public class AMQShortStringTest extends TestCase
     {
         AMQShortString string = new AMQShortString("test");
         assertEquals("constructed amq short string length differs from expected", 4, string.length());
-        assertTrue("constructed amq short string differs from expected", string.equals("test"));
+        assertTrue("constructed amq short string differs from expected", string.equalsCharSequence("test"));
     }
 
     /**
@@ -153,7 +153,7 @@ public class AMQShortStringTest extends TestCase
         char[] chars = "test".toCharArray();
         AMQShortString string = new AMQShortString(chars);
         assertEquals("constructed amq short string length differs from expected", 4, string.length());
-        assertTrue("constructed amq short string differs from expected", string.equals("test"));
+        assertTrue("constructed amq short string differs from expected", string.equalsCharSequence("test"));
     }
 
     /**
@@ -166,7 +166,7 @@ public class AMQShortStringTest extends TestCase
     {
         AMQShortString string = new AMQShortString((CharSequence) "test");
         assertEquals("constructed amq short string length differs from expected", 4, string.length());
-        assertTrue("constructed amq short string differs from expected", string.equals("test"));
+        assertTrue("constructed amq short string differs from expected", string.equalsCharSequence("test"));
     }
 
     /**