You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2022/09/01 05:28:12 UTC
[felix-dev] branch master updated: Fix for FELIX-6563: [Regression] Webconsole REST API doesn't return Confguration PID when creating a new configuration (#171)
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 25b757aabc Fix for FELIX-6563: [Regression] Webconsole REST API doesn't return Confguration PID when creating a new configuration (#171)
25b757aabc is described below
commit 25b757aabc08d265a96297ed5d3a10f530a39692
Author: Nicola Scendoni <ns...@adobe.com>
AuthorDate: Thu Sep 1 07:28:07 2022 +0200
Fix for FELIX-6563: [Regression] Webconsole REST API doesn't return Confguration PID when creating a new configuration (#171)
---
.../felix/webconsole/internal/configuration/ConfigAdminSupport.java | 3 ++-
.../apache/felix/webconsole/internal/configuration/ConfigManager.java | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java
index cf0ceaf2d8..22808db8c2 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java
@@ -115,7 +115,7 @@ class ConfigAdminSupport {
* @throws IOException If a problem occurs
* @throws ValidationException If the configuration is not valid
*/
- void applyConfiguration( final HttpServletRequest request, final String pid, final String[] propertyList, final boolean isUpdate )
+ String applyConfiguration( final HttpServletRequest request, final String pid, final String[] propertyList, final boolean isUpdate )
throws ValidationException, IOException
{
final String factoryPid = request.getParameter( ConfigManager.FACTORY_PID );
@@ -303,6 +303,7 @@ class ConfigAdminSupport {
}
}
config.update( props );
+ return config.getPid();
}
public void deleteConfiguration(final String pid) throws ValidationException, IOException {
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigManager.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigManager.java
index 71843679a8..89bfc1fa3a 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigManager.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigManager.java
@@ -156,8 +156,7 @@ public class ConfigManager extends SimpleWebConsolePlugin implements OsgiManager
}
try {
- cas.applyConfiguration( request, pid, propertyList.split(","), ACTION_UPDATE.equals(request.getParameter(ACTION_APPLY)));
- String redirect = pid;
+ String redirect = cas.applyConfiguration( request, pid, propertyList.split(","), ACTION_UPDATE.equals(request.getParameter(ACTION_APPLY)));
if (pidFilter != null) {
redirect = redirect.concat("?").concat(PID_FILTER).concat("=").concat(pidFilter);
}