Fix a number of minor issues reported from 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/0e5b55bd Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/0e5b55bd Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/0e5b55bd
Branch: refs/heads/master Commit: 0e5b55bd18b615243f4afbb83673b4c700a1665e Parents: 36f5afb Author: Timothy Bish <tabish...@gmail.com> Authored: Thu Oct 2 17:47:22 2014 -0400 Committer: Timothy Bish <tabish...@gmail.com> Committed: Thu Oct 2 17:47:22 2014 -0400 ---------------------------------------------------------------------- .../apache/qpid/jms/JmsConnectionMetaData.java | 3 ++- .../apache/qpid/jms/message/JmsMapMessage.java | 2 +- .../jms/provider/amqp/AmqpFixedProducer.java | 2 +- .../amqp/message/AmqpJmsBytesMessageFacade.java | 2 +- .../amqp/message/AmqpJmsMessageFacade.java | 2 +- .../qpid/jms/transports/RawTcpTransport.java | 11 ++--------- .../org/apache/qpid/jms/util/PropertyUtil.java | 19 +++++++++---------- .../apache/qpid/jms/util/ToStringSupport.java | 5 ++--- 8 files changed, 19 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0e5b55bd/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionMetaData.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionMetaData.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionMetaData.java index f674320..024fcdf 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionMetaData.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionMetaData.java @@ -19,6 +19,7 @@ package org.apache.qpid.jms; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; +import java.nio.charset.Charset; import java.util.Enumeration; import java.util.Vector; import java.util.regex.Matcher; @@ -57,7 +58,7 @@ public final class JmsConnectionMetaData implements ConnectionMetaData { InputStream in = null; if ((in = JmsConnectionMetaData.class.getResourceAsStream("/org/apache/qpid/jms/version.txt")) != null) { try { - BufferedReader reader = new BufferedReader(new InputStreamReader(in)); + BufferedReader reader = new BufferedReader(new InputStreamReader(in, Charset.forName("US-ASCII"))); version = reader.readLine(); Pattern pattern = Pattern.compile("(\\d+)\\.(\\d+).*"); Matcher m = pattern.matcher(version); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0e5b55bd/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java index 9414eca..e79cd78 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java @@ -185,7 +185,7 @@ public class JmsMapMessage extends JmsMessage implements MapMessage { Object value = getObject(name); if (value == null) { - return (byte[]) value; + return null; } else if (value instanceof byte[]) { byte[] original = (byte[]) value; byte[] clone = new byte[original.length]; http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0e5b55bd/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 18085d0..6a37da3 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 @@ -242,7 +242,7 @@ public class AmqpFixedProducer extends AmqpProducer { Target target = new Target(); target.setAddress(destnationName); - String senderName = sourceAddress + ":" + destnationName != null ? destnationName : "Anonymous"; + String senderName = sourceAddress + ":" + destnationName; endpoint = session.getProtonSession().sender(senderName); endpoint.setSource(source); endpoint.setTarget(target); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0e5b55bd/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java index a89eadc..ea29b06 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java @@ -125,7 +125,7 @@ public class AmqpJmsBytesMessageFacade extends AmqpJmsMessageFacade implements J if (value instanceof Binary) { Binary payload = (Binary)value; - if (payload != null && payload.getLength() != 0) { + if (payload.getLength() != 0) { result = payload; } } else { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0e5b55bd/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java index ea3310a..55671df 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java @@ -421,7 +421,7 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { } else { boolean appSpecific = false; boolean hasMessageIdPrefix = messageIdHelper.hasMessageIdPrefix(correlationId); - if (correlationId != null && !hasMessageIdPrefix) { + if (!hasMessageIdPrefix) { appSpecific = true; } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0e5b55bd/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/RawTcpTransport.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/RawTcpTransport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/RawTcpTransport.java index 6d99849..cb2b931 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/RawTcpTransport.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/RawTcpTransport.java @@ -21,7 +21,6 @@ import io.netty.buffer.ByteBuf; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.net.InetSocketAddress; import java.net.Socket; import java.net.SocketException; @@ -177,14 +176,8 @@ public class RawTcpTransport implements Transport, Runnable { public void send(ByteBuffer output) throws IOException { checkConnected(); LOG.info("RawTcpTransport sending packet of size: {}", output.remaining()); - if (dataOut instanceof OutputStream) { - WritableByteChannel channel = Channels.newChannel(dataOut); - channel.write(output); - } else { - while (output.hasRemaining()) { - dataOut.writeByte(output.get()); - } - } + WritableByteChannel channel = Channels.newChannel(dataOut); + channel.write(output); dataOut.flush(); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0e5b55bd/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 e604166..0c6b54b 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 @@ -33,6 +33,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; +import java.util.Map.Entry; import javax.net.ssl.SSLContext; @@ -122,16 +123,15 @@ public class PropertyUtil { if (options.size() > 0) { StringBuffer rc = new StringBuffer(); boolean first = true; - for (String key : options.keySet()) { + for (Entry<String, ? extends Object> entry : options.entrySet()) { if (first) { first = false; } else { rc.append("&"); } - String value = (String) options.get(key); - rc.append(URLEncoder.encode(key, "UTF-8")); + rc.append(URLEncoder.encode(entry.getKey(), "UTF-8")); rc.append("="); - rc.append(URLEncoder.encode(value, "UTF-8")); + rc.append(URLEncoder.encode((String) entry.getValue(), "UTF-8")); } return rc.toString(); } else { @@ -212,12 +212,11 @@ public class PropertyUtil { HashMap<String, String> rc = new HashMap<String, String>(props.size()); - for (Iterator<String> iter = props.keySet().iterator(); iter.hasNext();) { - String name = iter.next(); - if (name.startsWith(optionPrefix)) { - String value = props.get(name); - name = name.substring(optionPrefix.length()); - rc.put(name, value); + for (Iterator<Entry<String, String>> iter = props.entrySet().iterator(); iter.hasNext();) { + Entry<String, String> entry = iter.next(); + if (entry.getKey().startsWith(optionPrefix)) { + String name = entry.getKey().substring(optionPrefix.length()); + rc.put(name, entry.getValue()); iter.remove(); } } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0e5b55bd/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ToStringSupport.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ToStringSupport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ToStringSupport.java index 6ed6a3a..fe47c1f 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ToStringSupport.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ToStringSupport.java @@ -49,9 +49,8 @@ public final class ToStringSupport { LinkedHashMap<String, Object> map = new LinkedHashMap<String, Object>(); addFields(target, target.getClass(), stopClass, map); if (overrideFields != null) { - for(String key : overrideFields.keySet()) { - Object value = overrideFields.get(key); - map.put(key, value); + for(Entry<String, Object> entry : overrideFields.entrySet()) { + map.put(entry.getKey(), entry.getValue()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
