You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2017/11/10 16:11:34 UTC
[1/2] qpid-broker-j git commit: NO-JIRA: [Broker-J]
FieldTableMessageTest was erroneously testing the client implementation
instead of the broker impl
Repository: qpid-broker-j
Updated Branches:
refs/heads/master e3260f592 -> e08052db3
NO-JIRA: [Broker-J] FieldTableMessageTest was erroneously testing the client implementation instead of the broker impl
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/e1eec64a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/e1eec64a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/e1eec64a
Branch: refs/heads/master
Commit: e1eec64a5bf25ced6c2b0eb08e3c4d2d7762f91e
Parents: e3260f5
Author: Lorenz Quack <lq...@apache.org>
Authored: Fri Nov 10 15:59:25 2017 +0000
Committer: Lorenz Quack <lq...@apache.org>
Committed: Fri Nov 10 15:59:25 2017 +0000
----------------------------------------------------------------------
.../apache/qpid/test/unit/basic/FieldTableMessageTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/e1eec64a/systests/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java b/systests/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
index e739a38..20b38d5 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
@@ -37,10 +37,10 @@ import javax.jms.Session;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.framing.AMQFrameDecodingException;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.FieldTableFactory;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.v0_8.AMQFrameDecodingException;
+import org.apache.qpid.server.protocol.v0_8.FieldTable;
+import org.apache.qpid.server.protocol.v0_8.FieldTableFactory;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class FieldTableMessageTest extends QpidBrokerTestCase implements MessageListener
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-broker-j git commit: QPID-8030: [Broker-J] Message
conversion from 0-8 to 1.0 should preserve binary correlationId
Posted by lq...@apache.org.
QPID-8030: [Broker-J] Message conversion from 0-8 to 1.0 should preserve binary correlationId
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/e08052db
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/e08052db
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/e08052db
Branch: refs/heads/master
Commit: e08052db31043b9c5ba13981c8778b668eb23448
Parents: e1eec64
Author: Lorenz Quack <lq...@apache.org>
Authored: Fri Nov 10 16:04:00 2017 +0000
Committer: Lorenz Quack <lq...@apache.org>
Committed: Fri Nov 10 16:04:00 2017 +0000
----------------------------------------------------------------------
.../v0_8_v1_0/MessageConverter_0_8_to_1_0.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/e08052db/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
index 32a076c..6839993 100644
--- a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
+++ b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
@@ -21,6 +21,8 @@
package org.apache.qpid.server.protocol.converter.v0_8_v1_0;
import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -88,7 +90,16 @@ public class MessageConverter_0_8_to_1_0 extends MessageConverter_to_1_0<AMQMess
final AMQShortString correlationId = contentHeader.getCorrelationId();
if(correlationId != null)
{
- props.setCorrelationId(correlationId.toString());
+ final byte[] correlationIdAsBytes = correlationId.getBytes();
+ final String correlationIdAsString = contentHeader.getCorrelationIdAsString();
+ if (Arrays.equals(correlationIdAsBytes, correlationIdAsString.getBytes(StandardCharsets.UTF_8)))
+ {
+ props.setCorrelationId(correlationIdAsString);
+ }
+ else
+ {
+ props.setCorrelationId(correlationIdAsBytes);
+ }
}
final AMQShortString messageId = contentHeader.getMessageId();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org