You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2010/01/29 19:40:43 UTC
svn commit: r904585 - in /activemq/trunk/activemq-core/src:
main/java/org/apache/activemq/command/ActiveMQTextMessage.java
test/java/org/apache/activemq/bugs/AMQ2585Test.java
Author: gtully
Date: Fri Jan 29 18:40:42 2010
New Revision: 904585
URL: http://svn.apache.org/viewvc?rev=904585&view=rev
Log:
resolve https://issues.apache.org/activemq/browse/AMQ-2585 with thanks. modified version of test applied, min size override is only relevant on the broker as it is calculated on demand on the client
Added:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2585Test.java (with props)
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java?rev=904585&r1=904584&r2=904585&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java Fri Jan 29 18:40:42 2010
@@ -145,7 +145,7 @@
if (marshalledProperties != null) {
size += marshalledProperties.getLength();
}
- size = text.length() * 2;
+ size += text.length() * 2;
}
return super.getSize();
}
Added: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2585Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2585Test.java?rev=904585&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2585Test.java (added)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2585Test.java Fri Jan 29 18:40:42 2010
@@ -0,0 +1,82 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.bugs;
+
+import javax.jms.Destination;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+import org.apache.activemq.EmbeddedBrokerAndConnectionTestSupport;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.command.ActiveMQTextMessage;
+import org.apache.activemq.spring.ConsumerBean;
+
+public class AMQ2585Test extends EmbeddedBrokerAndConnectionTestSupport {
+ private final Destination destination = new ActiveMQQueue("MyQueue");
+ final static String LENGTH10STRING = "1234567890";
+ private Session session;
+ private MessageProducer producer;
+ private ConsumerBean messageList;
+
+ public void testOneMessageWithProperties() throws Exception {
+ TextMessage message = session.createTextMessage(LENGTH10STRING);
+ message.setStringProperty(LENGTH10STRING, LENGTH10STRING);
+ producer.send(message);
+
+ messageList.assertMessagesArrived(1);
+
+ ActiveMQTextMessage received = ((ActiveMQTextMessage) messageList
+ .flushMessages().get(0));
+
+ assertEquals(LENGTH10STRING, received.getText());
+ assertTrue(received.getProperties().size() > 0);
+ assertTrue(received.propertyExists(LENGTH10STRING));
+ assertEquals(LENGTH10STRING, received.getStringProperty(LENGTH10STRING));
+
+ /**
+ * As specified by getSize(), the size (memory usage) of the body should
+ * be length of text * 2. Unsure of how memory usage is calculated for
+ * properties, but should probably not be less than the sum of (string)
+ * lengths for the key name and value.
+ */
+
+ final int sizeShouldBeNoLessThan = LENGTH10STRING.length() * 4 + received.DEFAULT_MINIMUM_MESSAGE_SIZE;
+ assertTrue("Message size was smaller than expected: " + received.getSize(),
+ received.getSize() >= sizeShouldBeNoLessThan);
+ assertFalse(LENGTH10STRING.length() * 2 == received.getSize());
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ bindAddress = bindAddress + "?marshal=true";
+ super.setUp();
+ messageList = new ConsumerBean();
+ messageList.setVerbose(true);
+
+ session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ MessageConsumer messageConsumer = session.createConsumer(destination);
+
+ messageConsumer.setMessageListener(messageList);
+
+ producer = session.createProducer(destination);
+ }
+}
Propchange: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2585Test.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2585Test.java
------------------------------------------------------------------------------
svn:keywords = Rev Date