diff options
Diffstat (limited to 'java')
25 files changed, 87 insertions, 106 deletions
diff --git a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java b/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java index 290895df60..2c3857a689 100644 --- a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java +++ b/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java @@ -422,7 +422,7 @@ public class Session if(m != null) return m; } - wait(); + getEndpoint().getLock().wait(); } catch (InterruptedException e) { diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryString.java b/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryString.java index c8af187a5f..5886afadfb 100644 --- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryString.java +++ b/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryString.java @@ -60,6 +60,11 @@ final class BinaryString public final boolean equals(Object o) { + if(!(o instanceof BinaryString)) + { + return false; + } + BinaryString buf = (BinaryString) o; final int size = _size; if (size != buf._size) diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java b/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java index 4e1a90d4d2..92ddad1c67 100644 --- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java +++ b/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java @@ -424,6 +424,7 @@ public class ConnectionEndpoint implements DescribedTypeConstructorRegistry.Sour case AWAITING_OPEN: case CLOSE_SENT: _state = ConnectionState.CLOSED; + break; case OPEN: _state = ConnectionState.CLOSE_RECEIVED; case CLOSED: @@ -1060,7 +1061,6 @@ public class ConnectionEndpoint implements DescribedTypeConstructorRegistry.Sour public boolean isClosed() { return _state == ConnectionState.CLOSED - || _state == ConnectionState.CLOSE_RECEIVED || _state == ConnectionState.CLOSE_RECEIVED; } diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Source.java b/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Source.java index e24fb1af7d..bfdfdbcbcc 100644 --- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Source.java +++ b/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Source.java @@ -25,6 +25,7 @@ package org.apache.qpid.amqp_1_0.type.messaging; +import java.util.Arrays; import java.util.Map; @@ -260,7 +261,7 @@ public class Source { builder.append(','); } - builder.append("outcomes=").append(_outcomes); + builder.append("outcomes=").append(Arrays.toString(_outcomes)); } if(_capabilities != null) @@ -269,7 +270,7 @@ public class Source { builder.append(','); } - builder.append("capabilities=").append(_capabilities); + builder.append("capabilities=").append(Arrays.toString(_capabilities)); } builder.append('}'); diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Target.java b/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Target.java index ea9319d31d..496fee520e 100644 --- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Target.java +++ b/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Target.java @@ -25,6 +25,7 @@ package org.apache.qpid.amqp_1_0.type.messaging; +import java.util.Arrays; import java.util.Map; @@ -185,7 +186,7 @@ public class Target { builder.append(','); } - builder.append("capabilities=").append(_capabilities); + builder.append("capabilities=").append(Arrays.toString(_capabilities)); } builder.append('}'); diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Attach.java b/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Attach.java index d01dd0146c..73490f7eab 100644 --- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Attach.java +++ b/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Attach.java @@ -27,6 +27,7 @@ package org.apache.qpid.amqp_1_0.type.transport; import org.apache.qpid.amqp_1_0.transport.ConnectionEndpoint; +import java.util.Arrays; import java.util.Map; @@ -321,7 +322,7 @@ public class Attach { builder.append(','); } - builder.append("offeredCapabilities=").append(_offeredCapabilities); + builder.append("offeredCapabilities=").append(Arrays.toString(_offeredCapabilities)); } if(_desiredCapabilities != null) @@ -330,7 +331,7 @@ public class Attach { builder.append(','); } - builder.append("desiredCapabilities=").append(_desiredCapabilities); + builder.append("desiredCapabilities=").append(Arrays.toString(_desiredCapabilities)); } if(_properties != null) diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Begin.java b/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Begin.java index 558fcbf780..fc6ea98827 100644 --- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Begin.java +++ b/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Begin.java @@ -27,6 +27,7 @@ package org.apache.qpid.amqp_1_0.type.transport; import org.apache.qpid.amqp_1_0.transport.ConnectionEndpoint; +import java.util.Arrays; import java.util.Map; @@ -195,7 +196,7 @@ public class Begin { builder.append(','); } - builder.append("offeredCapabilities=").append(_offeredCapabilities); + builder.append("offeredCapabilities=").append(Arrays.toString(_offeredCapabilities)); } if(_desiredCapabilities != null) @@ -204,7 +205,7 @@ public class Begin { builder.append(','); } - builder.append("desiredCapabilities=").append(_desiredCapabilities); + builder.append("desiredCapabilities=").append(Arrays.toString(_desiredCapabilities)); } if(_properties != null) diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Open.java b/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Open.java index cabee25c73..dd273f2f4a 100644 --- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Open.java +++ b/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Open.java @@ -27,6 +27,7 @@ package org.apache.qpid.amqp_1_0.type.transport; import org.apache.qpid.amqp_1_0.transport.ConnectionEndpoint; +import java.util.Arrays; import java.util.Map; @@ -219,7 +220,7 @@ public class Open { builder.append(','); } - builder.append("outgoingLocales=").append(_outgoingLocales); + builder.append("outgoingLocales=").append(Arrays.toString(_outgoingLocales)); } if(_incomingLocales != null) @@ -228,7 +229,7 @@ public class Open { builder.append(','); } - builder.append("incomingLocales=").append(_incomingLocales); + builder.append("incomingLocales=").append(Arrays.toString(_incomingLocales)); } if(_offeredCapabilities != null) @@ -237,7 +238,7 @@ public class Open { builder.append(','); } - builder.append("offeredCapabilities=").append(_offeredCapabilities); + builder.append("offeredCapabilities=").append(Arrays.toString(_offeredCapabilities)); } if(_desiredCapabilities != null) @@ -246,7 +247,7 @@ public class Open { builder.append(','); } - builder.append("desiredCapabilities=").append(_desiredCapabilities); + builder.append("desiredCapabilities=").append(Arrays.toString(_desiredCapabilities)); } if(_properties != null) diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java b/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java index ab06f1b94b..7144c179ca 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java @@ -111,7 +111,7 @@ public class ManagementModeStoreHandler implements ConfigurationEntryStore else if (_quiescedEntries.containsKey(id)) { // save entry with the original state - entry = createEntryWithState(entry, _quiescedEntries.get(ATTRIBUTE_STATE)); + entry = createEntryWithState(entry, _quiescedEntries.get(id)); } else if (_rootId.equals(id)) { @@ -119,7 +119,7 @@ public class ManagementModeStoreHandler implements ConfigurationEntryStore Set<UUID> childrenIds = new HashSet<UUID>(entry.getChildrenIds()); if (!_cliEntries.isEmpty()) { - childrenIds.removeAll(_cliEntries.entrySet()); + childrenIds.removeAll(_cliEntries.keySet()); } HashMap<String, Object> attributes = new HashMap<String, Object>(entry.getAttributes()); entry = new ConfigurationEntry(entry.getId(), entry.getType(), attributes, childrenIds, this); diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java b/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java index a04df9efe4..cc591b695e 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java @@ -302,17 +302,15 @@ public class MemoryConfigurationEntryStore implements ConfigurationEntryStore { if (is != null) { - if (is != null) + try { - try - { - is.close(); - } - catch (IOException e) - { - throw new IllegalConfigurationException("Cannot close input stream for: " + url, e); - } + is.close(); } + catch (IOException e) + { + throw new IllegalConfigurationException("Cannot close input stream for: " + url, e); + } + } } } diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java b/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java index 61738c0655..e917202612 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java @@ -96,16 +96,14 @@ public class TaskExecutor { LOGGER.debug("Stopping task executor immediately"); List<Runnable> cancelledTasks = executor.shutdownNow(); - if (cancelledTasks != null) + for (Runnable runnable : cancelledTasks) { - for (Runnable runnable : cancelledTasks) + if (runnable instanceof RunnableFuture<?>) { - if (runnable instanceof RunnableFuture<?>) - { - ((RunnableFuture<?>) runnable).cancel(true); - } + ((RunnableFuture<?>) runnable).cancel(true); } } + _executor = null; _taskThread = null; LOGGER.debug("Task executor was stopped immediately. Number of unfinished tasks: " + cancelledTasks.size()); @@ -256,14 +254,14 @@ public class TaskExecutor } } - private class ImmediateFuture<T> implements Future<T> + private static class ImmediateFuture<T> implements Future<T> { private T _result; public ImmediateFuture(T result) { super(); - this._result = result; + _result = result; } @Override diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractConfiguredObject.java b/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractConfiguredObject.java index aae5902388..81d9478152 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractConfiguredObject.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractConfiguredObject.java @@ -143,45 +143,45 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im { addParent((Class<ConfiguredObject>) entry.getKey(), entry.getValue()); } - if (attributes != null) + + Collection<String> names = getAttributeNames(); + if(names!=null) { - Collection<String> names = getAttributeNames(); - if(names!=null) + if(filterAttributes) { - if(filterAttributes) + for (String name : names) { - for (String name : names) + if (attributes.containsKey(name)) { - if (attributes.containsKey(name)) + final Object value = attributes.get(name); + if(value != null) { - final Object value = attributes.get(name); - if(value != null) - { - _attributes.put(name, value); - } - if(_automatedFields.containsKey(name)) - { - automatedSetValue(name, value); - } + _attributes.put(name, value); + } + if(_automatedFields.containsKey(name)) + { + automatedSetValue(name, value); } } } - else + } + else + { + for(Map.Entry<String, Object> entry : attributes.entrySet()) { - for(Map.Entry<String, Object> entry : attributes.entrySet()) + if(entry.getValue()!=null) { - if(entry.getValue()!=null) + _attributes.put(entry.getKey(),entry.getValue()); + if(_automatedFields.containsKey(entry.getKey())) { - _attributes.put(entry.getKey(),entry.getValue()); - if(_automatedFields.containsKey(entry.getKey())) - { - automatedSetValue(entry.getKey(), entry.getValue()); - } + automatedSetValue(entry.getKey(), entry.getValue()); } } } } + } + if (defaults != null) { _defaultAttributes.putAll(defaults); diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java index a1ccfc0d41..3ba1003531 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java @@ -2525,10 +2525,15 @@ public abstract class AbstractQueue } @Override - public synchronized void setExclusivityPolicy(final ExclusivityPolicy desiredPolicy) + public synchronized void setExclusivityPolicy(ExclusivityPolicy desiredPolicy) throws ExistingConsumerPreventsExclusive { - if(desiredPolicy != _exclusivityPolicy && !(desiredPolicy == null && _exclusivityPolicy == ExclusivityPolicy.NONE)) + if(desiredPolicy == null) + { + desiredPolicy = ExclusivityPolicy.NONE; + } + + if(desiredPolicy != _exclusivityPolicy) { switch(desiredPolicy) { diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java b/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java index 31c345f718..34585bb4f6 100644 --- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java +++ b/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java @@ -148,7 +148,7 @@ public class PlainConfiguration extends AbstractConfiguration { if(StringUtils.equalsIgnoreCase("GROUP", first)) { - throw new IllegalConfigurationException(String.format("GROUP keyword not supported. Groups should defined via a Group Provider, not in the ACL file.", getLine())); + throw new IllegalConfigurationException(String.format("GROUP keyword not supported at line %d. Groups should defined via a Group Provider, not in the ACL file.", getLine())); } else if (StringUtils.equalsIgnoreCase(CONFIG, first)) { diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java b/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java index 2e2b6b2041..fcb5bcbf70 100644 --- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java +++ b/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java @@ -185,7 +185,6 @@ public class RuleSet public void addRule(Integer number, String identity, Permission permission, AclAction action) { - _cache.clear(); if (!action.isAllowed()) { @@ -211,7 +210,7 @@ public class RuleSet } // save rule - _cache.remove(identity); + _cache.clear(); _rules.put(rule.getNumber(), rule); } diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java b/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java index 6d3babe515..9fe1babe20 100755 --- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java +++ b/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java @@ -150,7 +150,7 @@ public class ProtocolEngine_0_10 extends InputHandler implements ServerProtocol public void writerIdle() { - _connection.doHeartbeat(); + _connection.doHeartBeat(); } public void readerIdle() diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java b/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java index 024169326c..5bfc398bcf 100644 --- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java +++ b/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java @@ -590,10 +590,9 @@ public class ServerConnection extends Connection implements AMQConnectionModel<S super.setLocalAddress(localAddress); } - public void doHeartbeat() + public void doHeartBeat() { super.doHeartBeat(); - } @Override diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java b/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java index 6132b48722..1e5c8caa18 100644 --- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java +++ b/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java @@ -387,7 +387,7 @@ public class Session_1_0 implements SessionEventListener, AMQSessionModel<Sessio // TODO convert AMQP 1-0 node properties to queue attributes - final AMQQueue tempQueue = queue = getVirtualHost().createQueue(attributes); + queue = getVirtualHost().createQueue(attributes); } catch (AccessControlException e) { @@ -449,7 +449,7 @@ public class Session_1_0 implements SessionEventListener, AMQSessionModel<Sessio for(int i = 0; i < txnId.getLength(); i++) { id <<= 8; - id += data[i+txnId.getArrayOffset()]; + id += ((int)data[i+txnId.getArrayOffset()] & 0xff); } return id; diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java index f717ca4655..9efc670e99 100644 --- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java +++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java @@ -204,7 +204,7 @@ public class BasicMessageProducer_0_10 extends BasicMessageProducer } ByteBuffer data = message.getData(); - messageProps.setContentLength(data.remaining()); + messageProps.setContentLength(data == null ? 0 : data.remaining()); // send the message try diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java index 0b05179215..af36c75ef2 100644 --- a/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java +++ b/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java @@ -450,9 +450,9 @@ public class JMSMapMessage extends AbstractJMSMessage implements javax.jms.MapMe protected void populateMapFromData(ByteBuffer data) throws JMSException { - TypedBytesContentReader reader = new TypedBytesContentReader(data); if (data != null) { + TypedBytesContentReader reader = new TypedBytesContentReader(data); data.rewind(); final int entries = reader.readIntImpl(); diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQType.java b/java/common/src/main/java/org/apache/qpid/framing/AMQType.java index 5c89af09c4..4a6cfe6077 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/AMQType.java +++ b/java/common/src/main/java/org/apache/qpid/framing/AMQType.java @@ -596,22 +596,6 @@ public enum AMQType return EncodingUtils.encodedLongLength(); } - public int getEncodingSize(long value) - { - return EncodingUtils.encodedLongLength(); - } - - public AMQTypedValue asTypedValue(long value) - { - return AMQTypedValue.createAMQTypedValue(value); - } - - public void writeToBuffer(long value, DataOutput buffer) throws IOException - { - buffer.writeByte(identifier()); - EncodingUtils.writeLong(buffer, value); - } - public Object toNativeValue(Object value) { if (value instanceof Long) @@ -646,12 +630,6 @@ public enum AMQType EncodingUtils.writeLong(buffer, (Long) value); } - public long readLongFromBuffer(DataInput buffer) throws IOException - { - return EncodingUtils.readLong(buffer); - } - - public Object readValueFromBuffer(DataInput buffer) throws IOException { return EncodingUtils.readLong(buffer); diff --git a/java/jca/src/main/java/org/apache/qpid/ra/admin/AdminObjectFactory.java b/java/jca/src/main/java/org/apache/qpid/ra/admin/AdminObjectFactory.java index 213ea815f2..703547e2e8 100644 --- a/java/jca/src/main/java/org/apache/qpid/ra/admin/AdminObjectFactory.java +++ b/java/jca/src/main/java/org/apache/qpid/ra/admin/AdminObjectFactory.java @@ -38,9 +38,6 @@ public class AdminObjectFactory implements ObjectFactory @Override public Object getObjectInstance(Object object, Name name, Context context, Hashtable<?, ?> env) throws Exception { - - Object instance = null; - if (object instanceof Reference) { Reference ref = (Reference) object; @@ -49,10 +46,10 @@ public class AdminObjectFactory implements ObjectFactory if (ref.getClassName().equals(QpidQueueImpl.class.getName())) { RefAddr addr = ref.get(QpidQueueImpl.class.getName()); - bindingURLString = (String) addr.getContent(); - if (addr != null) { + bindingURLString = (String) addr.getContent(); + return new QpidQueueImpl(bindingURLString); } @@ -61,14 +58,14 @@ public class AdminObjectFactory implements ObjectFactory if (ref.getClassName().equals(QpidTopicImpl.class.getName())) { RefAddr addr = ref.get(QpidTopicImpl.class.getName()); - bindingURLString = (String) addr.getContent(); if (addr != null) { + bindingURLString = (String) addr.getContent(); return new QpidTopicImpl(bindingURLString); } } } - return instance; + return null; } } diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java b/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java index f242111dc5..4c223fab30 100644 --- a/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java +++ b/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java @@ -316,10 +316,7 @@ public class ClientJmsDelegate { _controllerSession.close(); } - if (_controllerConnection != null) - { - _controllerConnection.close(); - } + _controllerConnection.close(); } catch (final JMSException jmse) diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java b/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java index 844e3ecc11..340ae4a1ae 100644 --- a/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java +++ b/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java @@ -49,9 +49,9 @@ public class SortedQueueTest extends QpidBrokerTestCase { private static final Logger LOGGER = Logger.getLogger(SortedQueueTest.class); public static final String TEST_SORT_KEY = "testSortKey"; - private static final String VALUES[] = SortedQueueEntryListTest.keys.clone(); - private static final String VALUES_SORTED[] = SortedQueueEntryListTest.keys.clone(); - public final static String SUBSET_KEYS[] = { "000", "100", "200", "300", "400", "500", "600", "700", "800", "900" }; + private static final String[] VALUES = SortedQueueEntryListTest.keys.clone(); + private static final String[] VALUES_SORTED = SortedQueueEntryListTest.keys.clone(); + private final String[] SUBSET_KEYS = { "000", "100", "200", "300", "400", "500", "600", "700", "800", "900" }; private Connection _producerConnection; private Session _producerSession; @@ -397,7 +397,7 @@ public class SortedQueueTest extends QpidBrokerTestCase } catch(Exception e) { - fail("Could not get connection"); + throw new RuntimeException("Could not get connection"); } final Session session = conn.createSession((_sessionType == Session.SESSION_TRANSACTED ? true : false), diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java b/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java index 4752aec352..507c994076 100644 --- a/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java +++ b/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java @@ -99,11 +99,11 @@ public class SpawnedBrokerHolder implements BrokerHolder { String processIdStr = line.substring(processIdOffset); processIdStr = processIdStr.substring(0, processIdStr.indexOf(' ')); - processIdStr.trim(); + processIdStr = processIdStr.trim(); String parentProcessIdStr = line.substring(parentProcessIdOffset); parentProcessIdStr = parentProcessIdStr.substring(0, parentProcessIdStr.indexOf(' ')); - parentProcessIdStr.trim(); + parentProcessIdStr = parentProcessIdStr.trim(); if(parentProcessIdStr.length() > 0 && (parentProcess == null || parentProcess.equals(parentProcessIdStr))) { List<String> children = parentProcessMap.get(parentProcessIdStr); |