You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/12/20 21:02:36 UTC
[1/2] activemq-artemis git commit: This closes #1704
Repository: activemq-artemis
Updated Branches:
refs/heads/master b61be4dc4 -> d609e36f6
This closes #1704
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d609e36f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d609e36f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d609e36f
Branch: refs/heads/master
Commit: d609e36f689750a103418dc1e43a54a4834cf75d
Parents: b61be4d 2227685
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Dec 20 16:02:31 2017 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Dec 20 16:02:31 2017 -0500
----------------------------------------------------------------------
.../java/org/apache/activemq/artemis/api/core/Message.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-1553 JSON values all being
converted to String
Posted by cl...@apache.org.
ARTEMIS-1553 JSON values all being converted to String
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/22276856
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/22276856
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/22276856
Branch: refs/heads/master
Commit: 22276856b90645609650cef6ecaa42b90c701164
Parents: b61be4d
Author: Justin Bertram <jb...@apache.org>
Authored: Tue Dec 12 10:45:01 2017 -0600
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Dec 20 16:02:31 2017 -0500
----------------------------------------------------------------------
.../java/org/apache/activemq/artemis/api/core/Message.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/22276856/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
index 5e4dc74..7d29a33 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
@@ -635,9 +635,12 @@ public interface Message {
default Map<String, Object> toPropertyMap() {
Map map = new HashMap<>();
for (SimpleString name : getPropertyNames()) {
- //some property is SimpleString, which is not available for management console
Object value = getObjectProperty(name.toString());
- map.put(name.toString(), value == null ? null : value.toString());
+ //some property is SimpleString, which is not available for management console
+ if (value instanceof SimpleString) {
+ value = value.toString();
+ }
+ map.put(name.toString(), value);
}
return map;
}