You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2017/12/07 21:06:30 UTC

[1/2] activemq-artemis git commit: ARTEMIS-1544 Use the proper types when accessing ApplicationProperties

Repository: activemq-artemis
Updated Branches:
  refs/heads/master fdc71155c -> d9acc649a


ARTEMIS-1544 Use the proper types when accessing ApplicationProperties

Use Map<String, Object> to access the ApplicationProperties section
which is the spec defined type for that section.  This will prevent
breakage should proton-j be updated to reflect that in the definition of
that class.

Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4c046664
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4c046664
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4c046664

Branch: refs/heads/master
Commit: 4c0466642105de0828a2d1d31f0d3c3c1f4697df
Parents: fdc7115
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Dec 7 13:30:53 2017 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Dec 7 13:30:53 2017 -0500

----------------------------------------------------------------------
 .../artemis/protocol/amqp/converter/AmqpCoreConverter.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4c046664/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AmqpCoreConverter.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AmqpCoreConverter.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AmqpCoreConverter.java
index 8d05b2c..fbaf0ef 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AmqpCoreConverter.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AmqpCoreConverter.java
@@ -247,8 +247,8 @@ public class AmqpCoreConverter {
 
       final ApplicationProperties ap = amqp.getApplicationProperties();
       if (ap != null) {
-         for (Map.Entry<Object, Object> entry : (Set<Map.Entry<Object, Object>>) ap.getValue().entrySet()) {
-            setProperty(jms, entry.getKey().toString(), entry.getValue());
+         for (Map.Entry<String, Object> entry : (Set<Map.Entry<String, Object>>) ap.getValue().entrySet()) {
+            setProperty(jms, entry.getKey(), entry.getValue());
          }
       }
 


[2/2] activemq-artemis git commit: ARTEMIS-1544 - This closes #1693

Posted by cs...@apache.org.
ARTEMIS-1544 - This closes #1693


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d9acc649
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d9acc649
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d9acc649

Branch: refs/heads/master
Commit: d9acc649accfbbc223fc898de1f94b139a66a177
Parents: fdc7115 4c04666
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Authored: Thu Dec 7 16:01:52 2017 -0500
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Thu Dec 7 16:01:52 2017 -0500

----------------------------------------------------------------------
 .../artemis/protocol/amqp/converter/AmqpCoreConverter.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------