svn commit: r1366202 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/ActiveMQConnectionFactory.java test/java/org/apache/activemq/joramtests/ActiveMQAdmin.java test/java/org/apache/activemq/joramtests/JoramJmsTest.java

[ta...@apache.org]

Author: tabish
Date: Thu Jul 26 21:07:01 2012
New Revision: 1366202

URL: http://svn.apache.org/viewvc?rev=1366202&view=rev
Log:
fix for: https://issues.apache.org/jira/browse/AMQ-3947

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/joramtests/ActiveMQAdmin.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/joramtests/JoramJmsTest.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java?rev=1366202&r1=1366201&r2=1366202&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java Thu Jul 26 21:07:01 2012
@@ -347,6 +347,7 @@ public class ActiveMQConnectionFactory e
         connection.setMaxThreadPoolSize(getMaxThreadPoolSize());
         connection.setSessionTaskRunner(getSessionTaskRunner());
         connection.setRejectedTaskHandler(getRejectedTaskHandler());
+        connection.setNestedMapAndListEnabled(isNestedMapAndListEnabled());
         if (transportListener != null) {
             connection.addTransportListener(transportListener);
         }
@@ -765,6 +766,7 @@ public class ActiveMQConnectionFactory e
         props.setProperty("transactedIndividualAck", Boolean.toString(isTransactedIndividualAck()));
         props.setProperty("nonBlockingRedelivery", Boolean.toString(isNonBlockingRedelivery()));
         props.setProperty("maxThreadPoolSize", Integer.toString(getMaxThreadPoolSize()));
+        props.setProperty("nestedMapAndListEnabled", Boolean.toString(isNestedMapAndListEnabled()));
     }
 
     public boolean isUseCompression() {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/joramtests/ActiveMQAdmin.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/joramtests/ActiveMQAdmin.java?rev=1366202&r1=1366201&r2=1366202&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/joramtests/ActiveMQAdmin.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/joramtests/ActiveMQAdmin.java Thu Jul 26 21:07:01 2012
@@ -16,6 +16,15 @@
  */
 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.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerService;
@@ -23,14 +32,6 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.command.ActiveMQTopic;
 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>
@@ -118,6 +119,7 @@ public class ActiveMQAdmin implements Ad
     public void createConnectionFactory(String name) {
         try {
             final ConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost");
+            ((ActiveMQConnectionFactory) factory).setNestedMapAndListEnabled(false);
             context.bind(name, factory);
         } catch (NamingException e) {
             throw new RuntimeException(e);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/joramtests/JoramJmsTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/joramtests/JoramJmsTest.java?rev=1366202&r1=1366201&r2=1366202&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/joramtests/JoramJmsTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/joramtests/JoramJmsTest.java Thu Jul 26 21:07:01 2012
@@ -28,6 +28,7 @@ import org.objectweb.jtests.jms.conform.
 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.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.TemporaryQueueTest;
 import org.objectweb.jtests.jms.conform.selector.SelectorSyntaxTest;
@@ -60,8 +61,8 @@ public class JoramJmsTest extends TestCa
         suite.addTestSuite(TemporaryTopicTest.class);
         suite.addTestSuite(UnifiedSessionTest.class);
         suite.addTestSuite(QueueBrowserTest.class);
+        suite.addTestSuite(MessagePropertyTest.class);
 // TODO: figure out why the following tests are failing..
-//        suite.addTestSuite(MessagePropertyTest.class);
 //        suite.addTestSuite(SelectorTest.class);
         return suite;
     }