Author: tabish
Date: Sun Oct 16 14:28:42 2011
New Revision: 1184834
URL: http://svn.apache.org/viewvc?rev=1184834&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3500
Only validate the params inside the domain of the producer or consumer.
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java?rev=1184834&r1=1184833&r2=1184834&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
Sun Oct 16 14:28:42 2011
@@ -223,8 +223,8 @@ public class ActiveMQMessageConsumer imp
// Allows the options on the destination to configure the consumerInfo
if (dest.getOptions() != null) {
- Map<String, String> options = new HashMap<String,
String>(dest.getOptions());
- IntrospectionSupport.setProperties(this.info, options,
"consumer.");
+ Map<String, Object> options =
IntrospectionSupport.extractProperties(dest.getOptions(), "producer.");
+ IntrospectionSupport.setProperties(this.info, options);
if (options.size() > 0) {
String msg = "There are " + options.size()
+ " consumer options that couldn't be set on the consumer."
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java?rev=1184834&r1=1184833&r2=1184834&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java
Sun Oct 16 14:28:42 2011
@@ -87,8 +87,8 @@ public class ActiveMQMessageProducer ext
this.info.setWindowSize(session.connection.getProducerWindowSize());
// Allows the options on the destination to configure the producerInfo
if (destination != null && destination.getOptions() != null) {
- Map<String, String> options = new HashMap<String,
String>(destination.getOptions());
- IntrospectionSupport.setProperties(this.info, options,
"producer.");
+ Map<String, Object> options =
IntrospectionSupport.extractProperties(destination.getOptions(), "producer.");
+ IntrospectionSupport.setProperties(this.info, options);
if (options.size() > 0) {
String msg = "There are " + options.size()
+ " producer options that couldn't be set on the producer."
