diff options
Diffstat (limited to 'qpid/java/broker-core/src')
4 files changed, 21 insertions, 5 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java index fa4e3f21dd..597fc44e4c 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java @@ -281,4 +281,10 @@ class HeadersBinding return true; } + + @Override + public int hashCode() + { + return _binding == null ? 0 : _binding.hashCode(); + } } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java index 6c8945582c..f944821c6f 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java @@ -318,7 +318,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im checkCandidate((Class<? extends ConfiguredObject>) interfaceClass, candidates); } } - if(clazz.getSuperclass() != null & ConfiguredObject.class.isAssignableFrom(clazz.getSuperclass())) + if(clazz.getSuperclass() != null && ConfiguredObject.class.isAssignableFrom(clazz.getSuperclass())) { findBestFitInterface((Class<? extends ConfiguredObject>) clazz.getSuperclass(), candidates); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java index 0f4ecb09dc..b0dda69ee6 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java @@ -186,6 +186,7 @@ public abstract class AbstractSystemConfig<X extends SystemConfig<X>> ConfiguredObjectRecordConverter converter = new ConfiguredObjectRecordConverter(BrokerModel.getInstance()); Reader reader; + try { URL url = new URL(initialConfigurationLocation); @@ -196,9 +197,18 @@ public abstract class AbstractSystemConfig<X extends SystemConfig<X>> reader = new FileReader(initialConfigurationLocation); } - Collection<ConfiguredObjectRecord> records = converter.readFromJson(org.apache.qpid.server.model.Broker.class, - systemConfig, reader); - return records.toArray(new ConfiguredObjectRecord[records.size()]); + try + { + Collection<ConfiguredObjectRecord> records = + converter.readFromJson(org.apache.qpid.server.model.Broker.class, + systemConfig, reader); + return records.toArray(new ConfiguredObjectRecord[records.size()]); + } + finally + { + reader.close(); + } + } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java index 545a1d941d..c49c2790df 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java @@ -2925,7 +2925,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>> if(existingPolicy != _exclusive) { ExclusivityPolicy newPolicy = _exclusive; - _exclusive = newPolicy; + _exclusive = existingPolicy; updateExclusivityPolicy(newPolicy); } return true; |