summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2006-11-30 15:44:07 +0000
committerMartin Ritchie <ritchiem@apache.org>2006-11-30 15:44:07 +0000
commit988825d57b828ca355d56329e6553140efc27ab7 (patch)
tree776268ca73e1d2fc9aa5d69e8db8dc15a7a5c995 /java
parent505b253590d2cf8ebfe35ccd2ff3df2443240001 (diff)
downloadqpid-python-988825d57b828ca355d56329e6553140efc27ab7.tar.gz
FieldTable.java no longer has a keys() method as it already has a keySet(). Plus the implementation was broken.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@480973 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java22
-rw-r--r--java/common/src/main/java/org/apache/qpid/framing/FieldTable.java9
2 files changed, 18 insertions, 13 deletions
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
index 079def81d0..2e740aa3eb 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
@@ -25,6 +25,8 @@ import org.apache.qpid.client.message.JMSTextMessage;
import org.apache.qpid.client.message.TestMessageHelper;
import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
import javax.jms.JMSException;
@@ -41,13 +43,21 @@ public class FieldTableKeyEnumeratorTest extends TestCase
result.put("four", 4L);
result.put("five", 5L);
- Enumeration e = result.keys();
+ Iterator iterator = result.keySet().iterator();
+
+ try
+ {
+ assertTrue("one".equals(iterator.next()));
+ assertTrue("two".equals(iterator.next()));
+ assertTrue("three".equals(iterator.next()));
+ assertTrue("four".equals(iterator.next()));
+ assertTrue("five".equals(iterator.next()));
+ }
+ catch (NoSuchElementException e)
+ {
+ fail("All elements should be found.");
+ }
- assertTrue("one".equals(e.nextElement()));
- assertTrue("two".equals(e.nextElement()));
- assertTrue("three".equals(e.nextElement()));
- assertTrue("four".equals(e.nextElement()));
- assertTrue("five".equals(e.nextElement()));
}
public void testPropertEnu()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java b/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
index be456c8754..796e1843af 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
@@ -71,10 +71,10 @@ public class FieldTable extends LinkedHashMap
Object value;
switch (type)
{
- case 'S':
+ case'S':
value = EncodingUtils.readLongString(buffer);
break;
- case 'I':
+ case'I':
value = new Long(buffer.getUnsignedInt());
break;
default:
@@ -313,10 +313,5 @@ public class FieldTable extends LinkedHashMap
}
return encodingSize;
- }
-
- public Enumeration keys()
- {
- return new FieldTableKeyEnumeration(this);
}
}