diff options
3 files changed, 3 insertions, 3 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java index 49b0f2995c..1996c73222 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java +++ b/qpid/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/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java index 173705c0f7..ae5c560db0 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java +++ b/qpid/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/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java index 081b1d30ad..27fac12ac0 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java +++ b/qpid/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) { |