diff options
| author | Aidan Skinner <aidan@apache.org> | 2008-01-29 17:25:32 +0000 |
|---|---|---|
| committer | Aidan Skinner <aidan@apache.org> | 2008-01-29 17:25:32 +0000 |
| commit | 7675b973176b932a6ffc3f6de7e448089aa6f218 (patch) | |
| tree | 3e7611726f4e0cd86f71f18495879be3d17694fc /qpid/java | |
| parent | ab193b40b525295325800984a33b9a2c76ba48d2 (diff) | |
| download | qpid-python-7675b973176b932a6ffc3f6de7e448089aa6f218.tar.gz | |
Merged revisions 579126,579137 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2
........
r579126 | rgreig | 2007-09-25 09:42:53 +0100 (Tue, 25 Sep 2007) | 2 lines
QPID-582: fix some 1.6 compile errors
........
r579137 | rgreig | 2007-09-25 10:00:34 +0100 (Tue, 25 Sep 2007) | 2 lines
QPID-582 fix Java 6 compile errors
........
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@616454 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
2 files changed, 6 insertions, 5 deletions
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java index 7b084dd268..e306f0449a 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java @@ -59,7 +59,7 @@ public class ExchangeMBeanTest extends TestCase mbean.createNewBinding(_queue.getName().toString(), "binding2"); TabularData data = mbean.bindings(); - ArrayList<CompositeData> list = new ArrayList<CompositeData>(data.values()); + ArrayList<Object> list = new ArrayList<Object>(data.values()); assertTrue(list.size() == 2); // test general exchange properties @@ -85,7 +85,7 @@ public class ExchangeMBeanTest extends TestCase mbean.createNewBinding(_queue.getName().toString(), "binding2"); TabularData data = mbean.bindings(); - ArrayList<CompositeData> list = new ArrayList<CompositeData>(data.values()); + ArrayList<Object> list = new ArrayList<Object>(data.values()); assertTrue(list.size() == 2); // test general exchange properties @@ -111,7 +111,7 @@ public class ExchangeMBeanTest extends TestCase mbean.createNewBinding(_queue.getName().toString(), "key3=binding3"); TabularData data = mbean.bindings(); - ArrayList<CompositeData> list = new ArrayList<CompositeData>(data.values()); + ArrayList<Object> list = new ArrayList<Object>(data.values()); assertTrue(list.size() == 2); // test general exchange properties diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java index bc895411d2..12f38f1c74 100644 --- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java +++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java @@ -744,10 +744,11 @@ public class OperationTabControl extends TabControl } TabularDataSupport tabularData = (TabularDataSupport)result; - Collection<CompositeData> records = tabularData.values(); + Collection<Object> records = tabularData.values(); List<String> list = new ArrayList<String>(); - for (CompositeData data : records) + for (Object o : records) { + CompositeData data = (CompositeData) o; if (data.containsKey(USERNAME)) { list.add(data.get(USERNAME).toString()); |