From 22dca8ecab9da6519a98557600d7e9f29cfeb075 Mon Sep 17 00:00:00 2001
From: Michael Ranaldo <michael.ranaldo@payara.fish>
Date: Thu, 21 Sep 2017 10:28:26 +0100
Subject: [PATCH] PAYARA-2132 Fixed 404 on deleting JMS destination

---
 .../src/main/resources/physdest/physDestTable.jsf  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/appserver/admingui/jms-plugin/src/main/resources/physdest/physDestTable.jsf b/appserver/admingui/jms-plugin/src/main/resources/physdest/physDestTable.jsf
index 55e865664ee..c458493d8e3 100644
--- a/appserver/admingui/jms-plugin/src/main/resources/physdest/physDestTable.jsf
+++ b/appserver/admingui/jms-plugin/src/main/resources/physdest/physDestTable.jsf
@@ -57,7 +57,7 @@
                     gf.redirect(page="/jms/physdest/jmsPhysicalDestinationNew.jsf?target=#{pageSession.target}&parentPage=#{pageSession.selfPage}");
                 />
             </sun:button>
-
+                <h:outputText value="#{pageSession.selfPage}" />
             <sun:button id="deleteButton" text="$resource{i18n.button.Delete}" disabled="#{true}" primary="#{false}"
                     onClick="if (getConfirm(this,'$resource{i18n.msg.JS.confirmDeletePhysicalDestinations}') ) {submitAndDisable(this, '$resource{i18n.button.Processing}');}; return false;" >
             <!command
@@ -65,14 +65,14 @@
                 getSelectedSingleMapRows(TableRowGroup="${tableRowGroup}" selectedRows=>$attribute{selectedRows});
                 prepareSuccessfulMsg();
                 foreach (var="dest" list="$attribute{selectedRows}") {
-                     createMap(result="#{requestScope.attrsMap}");
-                     mapPut(map="#{requestScope.attrsMap}" key="desttype" value="#{dest.type}" );
-                     mapPut(map="#{requestScope.attrsMap}" key="id" value="#{dest.name}" );
-                     gf.restRequest(endpoint="#{pageSession.resourceUrl}/delete-jmsdest",
-                        attrs="#{requestScope.attrsMap}", method="delete", result="#{requestScope.result}");
+                    createMap(result="#{requestScope.attrsMap}");
+                    mapPut(map="#{requestScope.attrsMap}" key="desttype" value="#{dest.type}" );
+                    mapPut(map="#{requestScope.attrsMap}" key="id" value="#{dest.name}" );
+                    gf.restRequest(endpoint="#{pageSession.resourceUrl}/delete-jmsdest",
+                            attrs="#{requestScope.attrsMap}", method="delete", result="#{requestScope.result}");
                 }
                 setAttribute(key="selectedRows" value="${selectedRows}");
-                gf.redirect(page="#{pageSession.selfPage}");
+                gf.redirect(page="#{request.contextPath}/jms/physdest/serverPhysDest.jsf");
             />
             </sun:button>
             <sun:button id="flushButton" text="$resource{i18njms.jmsPhysDestinations.purge}" disabled="#{true}" primary="#{false}"