Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for: https://issues.apache.org/jira/browse/AMQ-3947 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1366202 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish 2012-07-26 21:07:01 +00:00
parent 27a74d381b
commit fefb228698
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
View File

@ -347,6 +347,7 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
connection.setMaxThreadPoolSize(getMaxThreadPoolSize()); connection.setMaxThreadPoolSize(getMaxThreadPoolSize());
connection.setSessionTaskRunner(getSessionTaskRunner()); connection.setSessionTaskRunner(getSessionTaskRunner());
connection.setRejectedTaskHandler(getRejectedTaskHandler()); connection.setRejectedTaskHandler(getRejectedTaskHandler());
connection.setNestedMapAndListEnabled(isNestedMapAndListEnabled());
if (transportListener != null) { if (transportListener != null) {
connection.addTransportListener(transportListener); connection.addTransportListener(transportListener);
} }
@ -765,6 +766,7 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
props.setProperty("transactedIndividualAck", Boolean.toString(isTransactedIndividualAck())); props.setProperty("transactedIndividualAck", Boolean.toString(isTransactedIndividualAck()));
props.setProperty("nonBlockingRedelivery", Boolean.toString(isNonBlockingRedelivery())); props.setProperty("nonBlockingRedelivery", Boolean.toString(isNonBlockingRedelivery()));
props.setProperty("maxThreadPoolSize", Integer.toString(getMaxThreadPoolSize())); props.setProperty("maxThreadPoolSize", Integer.toString(getMaxThreadPoolSize()));
props.setProperty("nestedMapAndListEnabled", Boolean.toString(isNestedMapAndListEnabled()));
} }
public boolean isUseCompression() { public boolean isUseCompression() {

18
activemq-core/src/test/java/org/apache/activemq/joramtests/ActiveMQAdmin.java
View File

@ -16,6 +16,15 @@
*/ */
package org.apache.activemq.joramtests; package org.apache.activemq.joramtests;
import java.io.File;
import java.net.URI;
import java.util.Hashtable;
import javax.jms.ConnectionFactory;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerFactory; import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.BrokerService;
@ -23,14 +32,6 @@ import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic; import org.apache.activemq.command.ActiveMQTopic;
import org.objectweb.jtests.jms.admin.Admin; import org.objectweb.jtests.jms.admin.Admin;
import javax.jms.ConnectionFactory;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import java.io.File;
import java.net.URI;
import java.util.Hashtable;
/** /**
* *
* @author <a href="http://hiramchirino.com">Hiram Chirino</a> * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
@ -118,6 +119,7 @@ public class ActiveMQAdmin implements Admin {
public void createConnectionFactory(String name) { public void createConnectionFactory(String name) {
try { try {
final ConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost"); final ConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost");
((ActiveMQConnectionFactory) factory).setNestedMapAndListEnabled(false);
context.bind(name, factory); context.bind(name, factory);
} catch (NamingException e) { } catch (NamingException e) {
throw new RuntimeException(e); throw new RuntimeException(e);

3
activemq-core/src/test/java/org/apache/activemq/joramtests/JoramJmsTest.java
View File

@ -28,6 +28,7 @@ import org.objectweb.jtests.jms.conform.message.MessageTypeTest;
import org.objectweb.jtests.jms.conform.message.headers.MessageHeaderTest; import org.objectweb.jtests.jms.conform.message.headers.MessageHeaderTest;
import org.objectweb.jtests.jms.conform.message.properties.JMSXPropertyTest; import org.objectweb.jtests.jms.conform.message.properties.JMSXPropertyTest;
import org.objectweb.jtests.jms.conform.message.properties.MessagePropertyConversionTest; import org.objectweb.jtests.jms.conform.message.properties.MessagePropertyConversionTest;
import org.objectweb.jtests.jms.conform.message.properties.MessagePropertyTest;
import org.objectweb.jtests.jms.conform.queue.QueueBrowserTest; import org.objectweb.jtests.jms.conform.queue.QueueBrowserTest;
import org.objectweb.jtests.jms.conform.queue.TemporaryQueueTest; import org.objectweb.jtests.jms.conform.queue.TemporaryQueueTest;
import org.objectweb.jtests.jms.conform.selector.SelectorSyntaxTest; import org.objectweb.jtests.jms.conform.selector.SelectorSyntaxTest;
@ -60,8 +61,8 @@ public class JoramJmsTest extends TestCase {
suite.addTestSuite(TemporaryTopicTest.class); suite.addTestSuite(TemporaryTopicTest.class);
suite.addTestSuite(UnifiedSessionTest.class); suite.addTestSuite(UnifiedSessionTest.class);
suite.addTestSuite(QueueBrowserTest.class); suite.addTestSuite(QueueBrowserTest.class);
suite.addTestSuite(MessagePropertyTest.class);
// TODO: figure out why the following tests are failing.. // TODO: figure out why the following tests are failing..
// suite.addTestSuite(MessagePropertyTest.class);
// suite.addTestSuite(SelectorTest.class); // suite.addTestSuite(SelectorTest.class);
return suite; return suite;
} }