diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-02-27 10:21:08 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-02-27 10:21:08 +0000 |
| commit | 793c824fa24cb0c90b205326d4199d6558944eda (patch) | |
| tree | 664b777e040905242804b9cc476750f8920001db /qpid/java | |
| parent | 4ae118bb7a81155a9f3d22af3a4a3f2191799c83 (diff) | |
| download | qpid-python-793c824fa24cb0c90b205326d4199d6558944eda.tar.gz | |
QPID-5577 : make changes to help code compile on Java 1.6
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1572498 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
3 files changed, 2 insertions, 6 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeImpl.java index 975cac5e54..f2f5fde603 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeImpl.java @@ -46,7 +46,7 @@ public interface ExchangeImpl<T extends NonDefaultExchange> extends ExchangeRefe */ boolean isAutoDelete(); - ExchangeImpl getAlternateExchange(); + <X extends NonDefaultExchange<X>> ExchangeImpl<X> getAlternateExchange(); void setAlternateExchange(ExchangeImpl exchange); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java index cd2f281bef..ac953b52a1 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java @@ -37,7 +37,7 @@ public interface Exchange<X extends Exchange<X>> extends ConfiguredObject<X> // Attributes @ManagedAttribute - Exchange<?> getAlternateExchange(); + <T extends Exchange<T>> Exchange<T> getAlternateExchange(); //children Collection<? extends Binding> getBindings(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java index f6625ed2b9..1a10537d7b 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java @@ -120,12 +120,8 @@ public interface Queue<X extends Queue<X>> extends ConfiguredObject<X> @ManagedAttribute int getPriorities(); - - //children Collection<? extends Binding> getBindings(); - Collection<? extends Consumer> getConsumers(); - //operations |