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 2018/05/03 16:08:39 UTC
[1/2] activemq-artemis git commit: [ARTEMIS-1845]Timestamp header
field should display in human readable format on console.
Repository: activemq-artemis
Updated Branches:
refs/heads/master a6c48a37c -> 541dfc695
[ARTEMIS-1845]Timestamp header field should display in human readable format on console.
no tests needed as this is an UI change
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/32c6759c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/32c6759c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/32c6759c
Branch: refs/heads/master
Commit: 32c6759c25f9226727c624f75d30ccd72097bcff
Parents: a6c48a3
Author: Shailendra Kumar Singh <sh...@gmail.com>
Authored: Thu May 3 21:09:50 2018 +0530
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu May 3 12:08:08 2018 -0400
----------------------------------------------------------------------
.../artemis/core/management/impl/openmbean/OpenTypeSupport.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/32c6759c/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/OpenTypeSupport.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/OpenTypeSupport.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/OpenTypeSupport.java
index bcda8c4..48cc2ea 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/OpenTypeSupport.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/OpenTypeSupport.java
@@ -27,6 +27,7 @@ import javax.management.openmbean.TabularDataSupport;
import javax.management.openmbean.TabularType;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -104,7 +105,7 @@ public final class OpenTypeSupport {
addItem(CompositeDataConstants.EXPIRATION, CompositeDataConstants.EXPIRATION_DESCRIPTION, SimpleType.LONG);
addItem(CompositeDataConstants.PRIORITY, CompositeDataConstants.PRIORITY_DESCRIPTION, SimpleType.BYTE);
addItem(CompositeDataConstants.REDELIVERED, CompositeDataConstants.REDELIVERED_DESCRIPTION, SimpleType.BOOLEAN);
- addItem(CompositeDataConstants.TIMESTAMP, CompositeDataConstants.TIMESTAMP_DESCRIPTION, SimpleType.LONG);
+ addItem(CompositeDataConstants.TIMESTAMP, CompositeDataConstants.TIMESTAMP_DESCRIPTION, SimpleType.DATE);
addItem(CompositeDataConstants.PROPERTIES, CompositeDataConstants.PROPERTIES_DESCRIPTION, SimpleType.STRING);
@@ -141,7 +142,7 @@ public final class OpenTypeSupport {
rc.put(CompositeDataConstants.TYPE, m.getType());
rc.put(CompositeDataConstants.DURABLE, m.isDurable());
rc.put(CompositeDataConstants.EXPIRATION, m.getExpiration());
- rc.put(CompositeDataConstants.TIMESTAMP, m.getTimestamp());
+ rc.put(CompositeDataConstants.TIMESTAMP, new Date(m.getTimestamp()));
rc.put(CompositeDataConstants.PRIORITY, m.getPriority());
rc.put(CompositeDataConstants.REDELIVERED, ref.getDeliveryCount() > 1);
[2/2] activemq-artemis git commit: This closes #2066
Posted by cl...@apache.org.
This closes #2066
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/541dfc69
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/541dfc69
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/541dfc69
Branch: refs/heads/master
Commit: 541dfc69513dab6a89550e9c3fc8f86f1c1afe78
Parents: a6c48a3 32c6759
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu May 3 12:08:33 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu May 3 12:08:33 2018 -0400
----------------------------------------------------------------------
.../artemis/core/management/impl/openmbean/OpenTypeSupport.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------