Repository: qpid-jms Updated Branches: refs/heads/master eec45adec -> c7475b0f0
Fix some issues reported by FindBugs Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/c7475b0f Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/c7475b0f Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/c7475b0f Branch: refs/heads/master Commit: c7475b0f0700c04fd9b563c4effc9064e6d7189b Parents: eec45ad Author: Timothy Bish <[email protected]> Authored: Wed Oct 1 18:50:38 2014 -0400 Committer: Timothy Bish <[email protected]> Committed: Wed Oct 1 18:50:38 2014 -0400 ---------------------------------------------------------------------- .../apache/qpid/jms/JmsConnectionFactory.java | 10 +++++----- .../apache/qpid/jms/meta/JmsConnectionId.java | 2 +- .../jms/provider/amqp/AmqpFixedProducer.java | 2 +- .../qpid/jms/provider/amqp/AmqpProvider.java | 4 +--- .../org/apache/qpid/jms/util/PropertyUtil.java | 20 +++++++++----------- .../qpid/jms/util/TypeConversionSupport.java | 8 ++++++++ 6 files changed, 25 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c7475b0f/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java index 1333a5e..3cf2e86 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java @@ -281,7 +281,7 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact return connectionIdGenerator; } - protected void setConnectionIdGenerator(IdGenerator connectionIdGenerator) { + protected synchronized void setConnectionIdGenerator(IdGenerator connectionIdGenerator) { this.connectionIdGenerator = connectionIdGenerator; } @@ -541,7 +541,7 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact this.prefetchPolicy = prefetchPolicy; } - public String getClientIDPrefix() { + public synchronized String getClientIDPrefix() { return clientIDPrefix; } @@ -551,7 +551,7 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact * * @param clientIDPrefix */ - public void setClientIDPrefix(String clientIDPrefix) { + public synchronized void setClientIDPrefix(String clientIDPrefix) { this.clientIDPrefix = clientIDPrefix; } @@ -566,7 +566,7 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact return clientIdGenerator; } - protected void setClientIdGenerator(IdGenerator clientIdGenerator) { + protected synchronized void setClientIdGenerator(IdGenerator clientIdGenerator) { this.clientIdGenerator = clientIdGenerator; } @@ -576,7 +576,7 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact * @param connectionIDPrefix * The string prefix used on all connection Id's created by this factory. */ - public void setConnectionIDPrefix(String connectionIDPrefix) { + public synchronized void setConnectionIDPrefix(String connectionIDPrefix) { this.connectionIDPrefix = connectionIDPrefix; } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c7475b0f/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionId.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionId.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionId.java index 05cda08..679b3b7 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionId.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionId.java @@ -16,7 +16,7 @@ */ package org.apache.qpid.jms.meta; -public class JmsConnectionId extends JmsAbstractResourceId implements Comparable<JmsConnectionId> { +public final class JmsConnectionId extends JmsAbstractResourceId implements Comparable<JmsConnectionId> { private final String value; http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c7475b0f/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java index 615f429..18085d0 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java @@ -286,7 +286,7 @@ public class AmqpFixedProducer extends AmqpProducer { return "AmqpFixedProducer { " + getProducerId() + " }"; } - private class PendingSend { + private static class PendingSend { public JmsOutboundMessageDispatch envelope; public AsyncResult request; http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c7475b0f/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java index 259948d..6e65c9a 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java @@ -189,9 +189,7 @@ public class AmqpProvider extends AbstractProvider implements TransportListener } } - if (serializer != null) { - serializer.shutdown(); - } + serializer.shutdown(); } } } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c7475b0f/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PropertyUtil.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PropertyUtil.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PropertyUtil.java index 8eb61d2..e604166 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PropertyUtil.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PropertyUtil.java @@ -178,17 +178,15 @@ public class PropertyUtil { public static Map<String, String> parseQuery(String uri) throws Exception { if (uri != null) { Map<String, String> rc = new HashMap<String, String>(); - if (uri != null) { - String[] parameters = uri.split("&"); - for (int i = 0; i < parameters.length; i++) { - int p = parameters[i].indexOf("="); - if (p >= 0) { - String name = URLDecoder.decode(parameters[i].substring(0, p), "UTF-8"); - String value = URLDecoder.decode(parameters[i].substring(p + 1), "UTF-8"); - rc.put(name, value); - } else { - rc.put(parameters[i], null); - } + String[] parameters = uri.split("&"); + for (int i = 0; i < parameters.length; i++) { + int p = parameters[i].indexOf("="); + if (p >= 0) { + String name = URLDecoder.decode(parameters[i].substring(0, p), "UTF-8"); + String value = URLDecoder.decode(parameters[i].substring(p + 1), "UTF-8"); + rc.put(name, value); + } else { + rc.put(parameters[i], null); } } return rc; http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c7475b0f/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/TypeConversionSupport.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/TypeConversionSupport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/TypeConversionSupport.java index 08c378c..6f246f0 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/TypeConversionSupport.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/TypeConversionSupport.java @@ -37,6 +37,14 @@ public final class TypeConversionSupport { @Override public boolean equals(Object o) { + if (this == o) { + return true; + } + + if (o == null || o.getClass() != this.getClass()) { + return false; + } + ConversionKey x = (ConversionKey) o; return x.from == from && x.to == to; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
