Author: gtully
Date: Wed Mar 24 13:51:00 2010
New Revision: 927054
URL: http://svn.apache.org/viewvc?rev=927054&view=rev
Log:
make ObjectMessage.copy aware of setObjectMessageSerializationDefered so that
copy on dispatch can operate on message dispatch fields but message
serialization is still avoided - resolve:
https://issues.apache.org/activemq/browse/AMQ-2622
Added:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java
(with props)
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java?rev=927054&r1=927053&r2=927054&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java
Wed Mar 24 13:51:00 2010
@@ -77,9 +77,15 @@ public class ActiveMQObjectMessage exten
}
private void copy(ActiveMQObjectMessage copy) {
- storeContent();
+ ActiveMQConnection connection = getConnection();
+ if (connection == null ||
!connection.isObjectMessageSerializationDefered()) {
+ storeContent();
+ copy.object = null;
+ } else {
+ copy.object = object;
+ }
super.copy(copy);
- copy.object = null;
+
}
public void storeContent() {
Added:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java?rev=927054&view=auto
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java
(added)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java
Wed Mar 24 13:51:00 2010
@@ -0,0 +1,139 @@
+/**
+ * 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.usecases;
+
+import javax.jms.Connection;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+
+import junit.framework.Test;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.ActiveMQSession;
+import org.apache.activemq.CombinationTestSupport;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQObjectMessage;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
+public class ObjectMessageNotSerializableTest extends CombinationTestSupport {
+
+ private static final Log LOG =
LogFactory.getLog(ObjectMessageNotSerializableTest.class);
+
+ BrokerService broker;
+ Connection connection;
+ ActiveMQSession session;
+ MessageProducer producer;
+ MessageConsumer consumer;
+ public ActiveMQDestination destination = new ActiveMQQueue("test");
+
+ int numReceived = 0;
+ boolean writeObjectCalled, readObjectCalled, readObjectNoDataCalled;
+
+ public static Test suite() {
+ return suite(ObjectMessageNotSerializableTest.class);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(suite());
+ }
+
+ protected void setUp() throws Exception {
+ broker = createBroker();
+ }
+
+ public void testSendNotSerializeableObjectMessage() throws Exception {
+
+ ActiveMQConnectionFactory factory = new
ActiveMQConnectionFactory("vm://localhost");
+ factory.setOptimizedMessageDispatch(true);
+ factory.setObjectMessageSerializationDefered(true);
+ factory.setCopyMessageOnSend(false);
+
+
+ connection = factory.createConnection();
+ session = (ActiveMQSession)connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ producer = session.createProducer(destination);
+
+ consumer = session.createConsumer(destination);
+ connection.start();
+
+ final MyObject obj = new MyObject("A message");
+
+ Thread consumerThread = new Thread("Consumer Thread") {
+ public void run() {
+ try {
+ ActiveMQObjectMessage message =
(ActiveMQObjectMessage)consumer.receive();
+ if ( message != null ) {
+ numReceived++;
+ MyObject object = (MyObject)message.getObject();
+ LOG.info("Got message " + object.getMessage());
+ }
+ consumer.close();
+ } catch (Throwable ex) {
+ ex.printStackTrace();
+ }
+ }
+ };
+
+ consumerThread.start();
+
+ Thread producingThread = new Thread("Producing Thread") {
+ public void run() {
+ try {
+ ActiveMQObjectMessage message =
(ActiveMQObjectMessage)session.createObjectMessage();
+ message.setObject(obj);
+ producer.send(message);
+ producer.close();
+ } catch (Throwable ex) {
+ ex.printStackTrace();
+ }
+ }
+ };
+
+ producingThread.start();
+
+ consumerThread.join();
+ producingThread.join();
+ session.close();
+
+ assertFalse("writeObject called", obj.getWriteObjectCalled());
+ assertFalse("readObject called", obj.getReadObjectCalled());
+ assertFalse("readObjectNoData called",
obj.getReadObjectNoDataCalled());
+
+ }
+
+ private BrokerService createBroker() throws Exception {
+ BrokerService broker = new BrokerService();
+ broker.setPersistent(false);
+ broker.setUseJmx(false);
+ broker.addConnector("vm://localhost");
+
+ broker.start();
+ broker.waitUntilStarted();
+ return broker;
+ }
+
+ protected void tearDown() throws Exception {
+ connection.stop();
+ broker.stop();
+ broker.waitUntilStopped();
+ }
+}
Propchange:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
