Repository: activemq-artemis Updated Branches: refs/heads/2.6.x 40f886d98 -> 9bb94d637
ARTEMIS-2137 web console retryMessage is broken (cherry picked from commit a9b3e8323449704d56b3d7b024568e4390006d74) Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/9bb94d63 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/9bb94d63 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/9bb94d63 Branch: refs/heads/2.6.x Commit: 9bb94d637f46d24fe329d354a652509cf4971d95 Parents: 40f886d Author: Shailendra Kumar Singh <[email protected]> Authored: Fri Oct 19 08:18:03 2018 +0530 Committer: Justin Bertram <[email protected]> Committed: Sun Dec 16 20:43:02 2018 -0600 ---------------------------------------------------------------------- artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js | 2 -- .../artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9bb94d63/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js ---------------------------------------------------------------------- diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js index 5d7989b..ac5a91b 100644 --- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js +++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js @@ -194,12 +194,10 @@ var ARTEMIS = (function(ARTEMIS) { if (mbean && selection) { var selectedItems = $scope.gridOptions.selectedItems; $scope.message = "Retry " + Core.maybePlural(selectedItems.length, "message"); - var operation = "retryMessage(java.lang.String)"; angular.forEach(selectedItems, function (item, idx) { var id = item.messageID; if (id) { var callback = (idx + 1 < selectedItems.length) ? intermediateResult : operationSuccess; - jolokia.execute(mbean, operation, id, onSuccess(callback)); ARTEMISService.artemisConsole.retryMessage(mbean, jolokia, id, onSuccess(callback)); } }); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9bb94d63/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js ---------------------------------------------------------------------- diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js index 2b0e9f8..f6c611a 100644 --- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js +++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js @@ -56,7 +56,7 @@ function ArtemisConsole() { }; this.retryMessage = function (mbean, jolokia, id, method) { - jolokia.execute(mbean, "retryMessage(java.lang.String)", id, method); + jolokia.execute(mbean, "retryMessage(long)", id, method); }; this.sendMessage = function (mbean, jolokia, headers, type, body, durable, user, pwd, method) {
