Author: rgodfrey
Date: Thu Jun 11 00:07:18 2015
New Revision: 1684800
URL: http://svn.apache.org/r1684800
Log:
QPID-6545 : Fix incorrect calculation of LONG_STRING length
Modified:
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java
Modified:
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java?rev=1684800&r1=1684799&r2=1684800&view=diff
==============================================================================
---
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
(original)
+++
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
Thu Jun 11 00:07:18 2015
@@ -182,19 +182,7 @@ public class EncodingUtils
}
else
{
- return 4 + s.length();
- }
- }
-
- public static int encodedLongStringLength(char[] s)
- {
- if (s == null)
- {
- return 4;
- }
- else
- {
- return 4 + s.length;
+ return 4 + getUTF8Length(s);
}
}
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java?rev=1684800&r1=1684799&r2=1684800&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java
Thu Jun 11 00:07:18 2015
@@ -76,12 +76,14 @@ public class UTF8Test extends QpidBroker
// Send data
MessageProducer msgProd = sess.createProducer(dest);
TextMessage message = sess.createTextMessage(data);
+ message.setStringProperty("stringProperty", data);
msgProd.send(message);
// consume data
TextMessage m = (TextMessage) msgCons.receive(RECEIVE_TIMEOUT);
assertNotNull(m);
- assertEquals(m.getText(), data);
+ assertEquals(data, m.getText());
+ assertEquals(data, message.getStringProperty("stringProperty"));
}
private Destination getDestination(String exch, String routkey, String
qname) throws Exception
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
