Author: aidan
Date: Tue Jan 29 09:25:32 2008
New Revision: 616454
URL: http://svn.apache.org/viewvc?rev=616454&view=rev
Log:
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
........
Modified:
incubator/qpid/trunk/qpid/ (props changed)
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
Propchange: incubator/qpid/trunk/qpid/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java?rev=616454&r1=616453&r2=616454&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
Tue Jan 29 09:25:32 2008
@@ -59,7 +59,7 @@
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 @@
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 @@
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
Modified:
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java?rev=616454&r1=616453&r2=616454&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
(original)
+++
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
Tue Jan 29 09:25:32 2008
@@ -744,10 +744,11 @@
}
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());
