QPID-107 : Changes based on code review.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@635602 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 15 insertions, 15 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 505c819bb2..665cbf7a84 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
@@ -325,7 +325,7 @@ public final class AMQShortString implements CharSequence, Comparable<AMQShortSt
 
         for (int i = 0; i < otherString.length(); i++)
         {
-            if (_data[i] != otherString._data[i])
+            if (charAt(i) != otherString.charAt(i))
             {
                 return false;
             }
@@ -646,7 +646,7 @@ public final class AMQShortString implements CharSequence, Comparable<AMQShortSt
 
 
 
-        return new AMQShortString(data,0,size);  
+        return new AMQShortString(data,0,size);
     }
 
     public int toIntValue()
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 0ea2c8b9c1..90584183ee 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
@@ -24,36 +24,36 @@ import junit.framework.TestCase;
 public class AMQShortStringTest extends TestCase
 {
 
-    AMQShortString Hello = new AMQShortString("Hello");
-    AMQShortString Hell = new AMQShortString("Hell");
-    AMQShortString Goodbye = new AMQShortString("Goodbye");
-    AMQShortString Good = new AMQShortString("Good");
-    AMQShortString Bye = new AMQShortString("Bye");
+    public static final AMQShortString HELLO = new AMQShortString("Hello");
+    public static final AMQShortString HELL = new AMQShortString("Hell");
+    public static final AMQShortString GOODBYE = new AMQShortString("Goodbye");
+    public static final AMQShortString GOOD = new AMQShortString("Good");
+    public static final AMQShortString BYE = new AMQShortString("BYE");
 
     public void testStartsWith()
     {
-        assertTrue(Hello.startsWith(Hell));
+        assertTrue(HELLO.startsWith(HELL));
 
-        assertFalse(Hell.startsWith(Hello));
+        assertFalse(HELL.startsWith(HELLO));
 
-        assertTrue(Goodbye.startsWith(Good));
+        assertTrue(GOODBYE.startsWith(GOOD));
 
-        assertFalse(Good.startsWith(Goodbye));
+        assertFalse(GOOD.startsWith(GOODBYE));
     }
 
     public void testEndWith()
     {
-        assertFalse(Hell.endsWith(Hello));
+        assertFalse(HELL.endsWith(HELLO));
 
-        assertTrue(Goodbye.endsWith(new AMQShortString("bye")));
+        assertTrue(GOODBYE.endsWith(new AMQShortString("bye")));
 
-        assertFalse(Goodbye.endsWith(Bye));
+        assertFalse(GOODBYE.endsWith(BYE));
     }
 
 
     public void testEquals()
     {
-        assertEquals(Goodbye, new AMQShortString("Goodbye"));
+        assertEquals(GOODBYE, new AMQShortString("Goodbye"));
         assertEquals(new AMQShortString("A"), new AMQShortString("A"));
         assertFalse(new AMQShortString("A").equals(new AMQShortString("a")));
     }