You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/02/11 20:31:48 UTC
svn commit: r1567321 - in
/qpid/branches/java-broker-amqp-1-0-management/java: ./
broker-core/src/main/java/org/apache/qpid/server/message/
broker-core/src/main/java/org/apache/qpid/server/queue/
broker-core/src/test/java/org/apache/qpid/server/queue/ ...
Author: rgodfrey
Date: Tue Feb 11 19:31:48 2014
New Revision: 1567321
URL: http://svn.apache.org/r1567321
Log:
Merged generics hacks back from trunk
Modified:
qpid/branches/java-broker-amqp-1-0-management/java/ (props changed)
qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java
qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
Propchange: qpid/branches/java-broker-amqp-1-0-management/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1567063,1567077
Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java?rev=1567321&r1=1567320&r2=1567321&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java Tue Feb 11 19:31:48 2014
@@ -54,7 +54,7 @@ public interface MessageSource<C extends
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);
Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java?rev=1567321&r1=1567320&r2=1567321&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java Tue Feb 11 19:31:48 2014
@@ -202,7 +202,7 @@ public abstract class QueueEntryImpl<E e
return acquired;
}
- public boolean acquire(QueueConsumer sub)
+ public boolean acquire(QueueConsumer<?,E,Q,L> sub)
{
final boolean acquired = acquire(sub.getOwningState());
if(acquired)
Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java?rev=1567321&r1=1567320&r2=1567321&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java Tue Feb 11 19:31:48 2014
@@ -348,7 +348,7 @@ public class StandardQueueTest extends S
}
@Override
- public boolean acquire(QueueConsumer sub)
+ public boolean acquire(QueueConsumer<?,DequeuedQueueEntry,DequeuedQueue,DequeuedQueueEntryList> sub)
{
if(_message.getMessageNumber() % 2 == 0)
{
Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java?rev=1567321&r1=1567320&r2=1567321&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java Tue Feb 11 19:31:48 2014
@@ -243,10 +243,10 @@ class ManagementNode implements MessageS
{
@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))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org