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 | bbd5c6c55f47ec973cbf035271ee8a276cb11217 (patch) | |
| tree | 5781e31ff15822dfb1ef4bc25422505efd409a69 /java/broker | |
| parent | 74ae7bb75e18f4c66b1bb322fc4051a20ba32f6a (diff) | |
| download | qpid-python-bbd5c6c55f47ec973cbf035271ee8a276cb11217.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/qpid@616454 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker')
| -rw-r--r-- | java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java b/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java index 7b084dd268..e306f0449a 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java +++ b/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 |