Merged generics hacks back from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-amqp-1-0-management@1567321 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 6 insertions, 6 deletions

diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java b/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java
index 49b0f2995c..1996c73222 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java
+++ b/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java
@@ -54,7 +54,7 @@ public interface MessageSource<C extends Consumer, S extends MessageSource<C,S>>
 
     boolean isExclusive();
 
-    interface ConsumerRegistrationListener<Q extends MessageSource<? extends Consumer,Q>>
+    interface ConsumerRegistrationListener<Q extends MessageSource<? extends Consumer,?>>
     {
         void consumerAdded(Q source, Consumer consumer);
         void consumerRemoved(Q queue, Consumer consumer);
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java b/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
index 173705c0f7..ae5c560db0 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
+++ b/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
@@ -202,7 +202,7 @@ public abstract class QueueEntryImpl<E extends QueueEntryImpl<E,Q,L>, Q extends
         return acquired;
     }
 
-    public boolean acquire(QueueConsumer sub)
+    public boolean acquire(QueueConsumer<?,E,Q,L> sub)
     {
         final boolean acquired = acquire(sub.getOwningState());
         if(acquired)
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java b/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
index 081b1d30ad..27fac12ac0 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
+++ b/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
@@ -348,7 +348,7 @@ public class StandardQueueTest extends SimpleAMQQueueTestBase<StandardQueueEntry
         }
 
         @Override
-        public boolean acquire(QueueConsumer sub)
+        public boolean acquire(QueueConsumer<?,DequeuedQueueEntry,DequeuedQueue,DequeuedQueueEntryList> sub)
         {
             if(_message.getMessageNumber() % 2 == 0)
             {
diff --git a/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java b/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
index 1c1c72dd0b..2b94aae5b7 100644
--- a/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
+++ b/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
@@ -243,10 +243,10 @@ class ManagementNode implements MessageSource<ManagementNodeConsumer,ManagementN
     {
 
         @SuppressWarnings("unchecked")
-        MessageConverter<M, InternalMessage> converter =
-                MessageConverterRegistry.getConverter((Class<M>)message.getClass(), InternalMessage.class);
+        MessageConverter converter =
+                MessageConverterRegistry.getConverter(message.getClass(), InternalMessage.class);
 
-        final InternalMessage msg = converter.<M>convert(message, _virtualHost);
+        final InternalMessage msg = (InternalMessage) converter.convert(message, _virtualHost);
 
         if(validateMessage(msg))
         {