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/27 11:21:08 UTC
svn commit: r1572498 - in /qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server: exchange/ExchangeImpl.java model/Exchange.java model/Queue.java

Author: rgodfrey
Date: Thu Feb 27 10:21:08 2014
New Revision: 1572498

URL: http://svn.apache.org/r1572498
Log:
QPID-5577 : make changes to help code compile on Java 1.6

Modified:
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeImpl.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeImpl.java?rev=1572498&r1=1572497&r2=1572498&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeImpl.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeImpl.java Thu Feb 27 10:21:08 2014
@@ -46,7 +46,7 @@ public interface ExchangeImpl<T extends 
      */
     boolean isAutoDelete();
 
-    ExchangeImpl getAlternateExchange();
+    <X extends NonDefaultExchange<X>> ExchangeImpl<X> getAlternateExchange();
 
     void setAlternateExchange(ExchangeImpl exchange);
 

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java?rev=1572498&r1=1572497&r2=1572498&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java Thu Feb 27 10:21:08 2014
@@ -37,7 +37,7 @@ public interface Exchange<X extends Exch
     // Attributes
 
     @ManagedAttribute
-    Exchange<?> getAlternateExchange();
+    <T extends Exchange<T>> Exchange<T> getAlternateExchange();
 
     //children
     Collection<? extends Binding> getBindings();

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java?rev=1572498&r1=1572497&r2=1572498&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java Thu Feb 27 10:21:08 2014
@@ -120,12 +120,8 @@ public interface Queue<X extends Queue<X
     @ManagedAttribute
     int getPriorities();
 
-
-
     //children
     Collection<? extends Binding> getBindings();
-    Collection<? extends Consumer> getConsumers();
-
 
     //operations
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org