You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2014/10/02 23:47:35 UTC
[1/5] git commit: Fix more issues from FindBugs
Repository: qpid-jms
Updated Branches:
refs/heads/master 58b48e5a8 -> 0e5b55bd1
Fix more issues 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/71055421
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/71055421
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/71055421
Branch: refs/heads/master
Commit: 71055421f869d3331c1f74ca3484531a6dab830b
Parents: 58b48e5
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Oct 2 16:40:16 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Oct 2 16:40:16 2014 -0400
----------------------------------------------------------------------
.../org/apache/qpid/jms/JmsPrefetchPolicy.java | 34 ++++++++++++++++----
.../apache/qpid/jms/meta/JmsConnectionInfo.java | 11 +++----
.../apache/qpid/jms/meta/JmsConsumerInfo.java | 11 +++----
.../apache/qpid/jms/meta/JmsProducerInfo.java | 11 +++----
.../qpid/jms/meta/JmsTransactionInfo.java | 11 +++----
5 files changed, 48 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/71055421/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsPrefetchPolicy.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsPrefetchPolicy.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsPrefetchPolicy.java
index c1212f2..1b99d04 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsPrefetchPolicy.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsPrefetchPolicy.java
@@ -162,13 +162,35 @@ public class JmsPrefetchPolicy extends Object implements Serializable {
}
@Override
- public boolean equals(Object object) {
- if (object instanceof JmsPrefetchPolicy) {
- JmsPrefetchPolicy other = (JmsPrefetchPolicy) object;
- return this.queuePrefetch == other.queuePrefetch && this.queueBrowserPrefetch == other.queueBrowserPrefetch
- && this.topicPrefetch == other.topicPrefetch && this.durableTopicPrefetch == other.durableTopicPrefetch;
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + durableTopicPrefetch;
+ result = prime * result + maxPrefetchSize;
+ result = prime * result + queueBrowserPrefetch;
+ result = prime * result + queuePrefetch;
+ result = prime * result + topicPrefetch;
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
}
- return false;
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+
+ JmsPrefetchPolicy other = (JmsPrefetchPolicy) obj;
+
+ return this.queuePrefetch == other.queuePrefetch &&
+ this.queueBrowserPrefetch == other.queueBrowserPrefetch &&
+ this.topicPrefetch == other.topicPrefetch &&
+ this.durableTopicPrefetch == other.durableTopicPrefetch;
}
private int getMaxPrefetchLimit(int value) {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/71055421/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java
index efdc6eb..d5e7677 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java
@@ -214,7 +214,7 @@ public final class JmsConnectionInfo implements JmsResource, Comparable<JmsConne
@Override
public int hashCode() {
- return this.connectionId.hashCode();
+ return (connectionId == null) ? super.hashCode() : connectionId.hashCode();
}
@Override
@@ -231,12 +231,11 @@ public final class JmsConnectionInfo implements JmsResource, Comparable<JmsConne
JmsConnectionInfo other = (JmsConnectionInfo) obj;
- if (connectionId == null && other.connectionId != null) {
- return false;
- } else if (!connectionId.equals(other.connectionId)) {
- return false;
+ if (connectionId != null) {
+ return connectionId.equals(other.connectionId);
}
- return true;
+
+ return false;
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/71055421/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java
index 2747453..3bc8027 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java
@@ -150,7 +150,7 @@ public final class JmsConsumerInfo implements JmsResource, Comparable<JmsConsume
@Override
public int hashCode() {
- return (consumerId == null) ? 0 : consumerId.hashCode();
+ return (consumerId == null) ? super.hashCode() : consumerId.hashCode();
}
@Override
@@ -167,12 +167,11 @@ public final class JmsConsumerInfo implements JmsResource, Comparable<JmsConsume
JmsConsumerInfo other = (JmsConsumerInfo) obj;
- if (consumerId == null && other.consumerId != null) {
- return false;
- } else if (!consumerId.equals(other.consumerId)) {
- return false;
+ if (consumerId != null) {
+ return consumerId.equals(other.consumerId);
}
- return true;
+
+ return false;
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/71055421/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsProducerInfo.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsProducerInfo.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsProducerInfo.java
index f9fd9b3..d38ba6c 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsProducerInfo.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsProducerInfo.java
@@ -65,7 +65,7 @@ public final class JmsProducerInfo implements JmsResource, Comparable<JmsProduce
@Override
public int hashCode() {
- return (producerId == null) ? 0 : producerId.hashCode();
+ return (producerId == null) ? super.hashCode() : producerId.hashCode();
}
@Override
@@ -82,13 +82,12 @@ public final class JmsProducerInfo implements JmsResource, Comparable<JmsProduce
JmsProducerInfo other = (JmsProducerInfo) obj;
- if (producerId == null && other.producerId != null) {
- return false;
- } else if (!producerId.equals(other.producerId)) {
- return false;
+ if (producerId != null) {
+ return producerId.equals(other.producerId);
}
- return true;
+ return false;
+
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/71055421/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsTransactionInfo.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsTransactionInfo.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsTransactionInfo.java
index 5fca50f..e4cdebd 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsTransactionInfo.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsTransactionInfo.java
@@ -48,7 +48,7 @@ public final class JmsTransactionInfo implements JmsResource, Comparable<JmsTran
@Override
public int hashCode() {
- return (transactionId == null) ? 0 : transactionId.hashCode();
+ return (transactionId == null) ? super.hashCode() : transactionId.hashCode();
}
@Override
@@ -65,12 +65,11 @@ public final class JmsTransactionInfo implements JmsResource, Comparable<JmsTran
JmsTransactionInfo other = (JmsTransactionInfo) obj;
- if (transactionId == null && other.transactionId != null) {
- return false;
- } else if (!transactionId.equals(other.transactionId)) {
- return false;
+ if (transactionId != null) {
+ return transactionId.equals(other.transactionId);
}
- return true;
+
+ return false;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[4/5] git commit: Check for the correct delegate type
Posted by ta...@apache.org.
Check for the correct delegate type
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/36f5afba
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/36f5afba
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/36f5afba
Branch: refs/heads/master
Commit: 36f5afba3c61a0a35085297703848893493cb9c9
Parents: e147848
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Oct 2 16:58:31 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Oct 2 16:58:31 2014 -0400
----------------------------------------------------------------------
.../qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/36f5afba/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java
index 0b3d51d..20053d6 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java
@@ -83,7 +83,7 @@ public class AmqpJmsObjectMessageFacade extends AmqpJmsMessageFacade implements
}
public boolean isAmqpTypedEncoding() {
- return this.delegate instanceof AmqpObjectTypeDelegate;
+ return this.delegate instanceof AmqpTypedObjectDelegate;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[5/5] git commit: Fix a number of minor issues reported from FindBugs.
Posted by ta...@apache.org.
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 <ta...@gmail.com>
Authored: Thu Oct 2 17:47:22 2014 -0400
Committer: Timothy Bish <ta...@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-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/5] git commit: Add note to explain duplicate code path.
Posted by ta...@apache.org.
Add note to explain duplicate code path.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/ac85f2fa
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/ac85f2fa
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/ac85f2fa
Branch: refs/heads/master
Commit: ac85f2fa4e07192ac7532386679850de625caaaa
Parents: 7105542
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Oct 2 16:57:23 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Oct 2 16:57:23 2014 -0400
----------------------------------------------------------------------
.../org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/ac85f2fa/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java
index d76e3d7..4107e3e 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java
@@ -87,6 +87,7 @@ public class AmqpTemporaryDestination extends AbstractAmqpResource<JmsDestinatio
if (info.isQueue()) {
sourceAddress = connection.getTempQueuePrefix() + sourceAddress;
} else {
+ // TODO - AMQ doesn't support temp topics so we make everything a temp queue for now
sourceAddress = connection.getTempQueuePrefix() + sourceAddress;
}
Source source = new Source();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/5] git commit: Fix setCorrelationId calling setMessageId when the
passed value is null. Also simplified the set correlation from bytes method
to make findbugs happy.
Posted by ta...@apache.org.
Fix setCorrelationId calling setMessageId when the passed value is null.
Also simplified the set correlation from bytes method to make findbugs
happy.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/e1478481
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/e1478481
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/e1478481
Branch: refs/heads/master
Commit: e1478481bc9cdbcc93eca183267db79a1ba8cc1e
Parents: ac85f2f
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Oct 2 16:58:17 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Oct 2 16:58:17 2014 -0400
----------------------------------------------------------------------
.../jms/provider/amqp/message/AmqpJmsMessageFacade.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e1478481/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 1859a47..ea3310a 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
@@ -417,7 +417,7 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
public void setCorrelationId(String correlationId) {
AmqpMessageIdHelper messageIdHelper = AmqpMessageIdHelper.INSTANCE;
if (correlationId == null) {
- message.setMessageId(null);
+ message.setCorrelationId(null);
} else {
boolean appSpecific = false;
boolean hasMessageIdPrefix = messageIdHelper.hasMessageIdPrefix(correlationId);
@@ -468,12 +468,12 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
@Override
public void setCorrelationIdBytes(byte[] correlationId) {
- if (correlationId == null) {
- message.setCorrelationId(correlationId);
- } else {
- byte[] bytes = Arrays.copyOf(correlationId, correlationId.length);
- message.setCorrelationId(new Binary(bytes));
+ Binary binaryIdValue = null;
+ if (correlationId != null) {
+ binaryIdValue = new Binary(Arrays.copyOf(correlationId, correlationId.length));
}
+
+ message.setCorrelationId(binaryIdValue);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org