Merge pull request #4321 from AlanRoth/PAYARA-4219-2

PAYARA-4219 Problem when trying to override System Properties of an instance
payara · Nov 20, 2019 · 11830c3 · 11830c3
2 parents b658393 + 495d2fc
commit 11830c3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2009-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009-2019 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -885,7 +885,7 @@ public static RestResponse post(String address, Object payload, String contentTy
         }
         Response cr = target.request(RESPONSE_TYPE).header("Content-Type", contentType)
                 .cookie(new Cookie(REST_TOKEN_COOKIE, getRestToken()))
-                //                .header("Content-type", MediaType.APPLICATION_FORM_URLENCODED)
+                //        .header("Content-type", MediaType.APPLICATION_FORM_URLENCODED)
                 .post(Entity.entity(payload, contentType), Response.class);
         RestResponse rr = RestResponse.getRestResponse(cr);
         return rr;

diff --git a/appserver/admingui/common/src/main/resources/configuration/sysInstanceValues.jsf b/appserver/admingui/common/src/main/resources/configuration/sysInstanceValues.jsf
@@ -2,7 +2,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010-2019 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
@@ -56,8 +56,8 @@
             setPageSessionAttribute(key="selfPage", value="#{request.contextPath}/common/configuration/sysInstanceValues.jsf?configName=#{pageSession.configName}");
             setPageSessionAttribute(key="parentUrl", value="#{sessionScope.REST_URL}/configs/config/#{pageSession.configName}");
             setPageSessionAttribute(key="selfUrl", value="#{pageSession.parentUrl}/system-properties");
-            gf.restRequest(endpoint="#{sessionScope.REST_URL}/configs/config/#{pageSession.configName}/system-property/#{pageSession.propName}", method="get",
-                result="#{requestScope.result}");
+            gf.restRequest(endpoint="#{sessionScope.REST_URL}/configs/config/#{pageSession.configName}/system-property/#{pageSession.propName}", 
+            method="get", result="#{requestScope.result}");
             setPageSessionAttribute(key="defaultValue", value="#{requestScope.result.data.extraProperties.entity.value}");
 
             // Get instance to cluster mapping
@@ -107,9 +107,9 @@
                         <!command
                             foreach (var="row" list="#{pageSession.tableList}") {
                                 createMap(result="#{requestScope.attrs}");
-                                mapPut(map="#{requestScope.attrs}", key="value", value="#{row.overrideValue}");
-                                gf.restRequest(endpoint="#{sessionScope.REST_URL}/servers/server/#{row.instance}/system-properties/#{pageSession.propName}", method="POST",
-                                    data="#{requestScope.attrs}", contentType="application/x-www-form-urlencoded", result="#{requestScope.restResponse}");
+                                mapPut(map="#{requestScope.attrs}", key="#{pageSession.propName}", value="#{row.overrideValue}");
+                                gf.restRequest(endpoint="#{sessionScope.REST_URL}/servers/server/#{row.instance}/system-properties", method="POST",
+                                    attrs="#{requestScope.attrs}", contentType="application/x-www-form-urlencoded", result="#{requestScope.restResponse}");
                             }
                             prepareSuccessfulMsg();
                             //gf.redirect(page="#{pageSession.parentPage}&alertType=${alertType}&alertSummary=${alertSummary}&alertDetail=${alertDetail}");

diff --git a/.../src/main/java/org/glassfish/admin/rest/resources/custom/SystemPropertiesCliResource.java b/.../src/main/java/org/glassfish/admin/rest/resources/custom/SystemPropertiesCliResource.java
@@ -256,7 +256,7 @@ protected String convertPropertyMapToString(Map<String, String> data) {
 
         return options.toString();
     }
-
+    
     protected Response saveProperties(Map<String, String> data) {
         return saveProperties(null, data);
     }