From fa2ee3ea96434c83246576456eb464bb2d066222 Mon Sep 17 00:00:00 2001
From: Ali HAMDI <ahamdi@exoplatform.com>
Date: Thu, 3 Aug 2023 11:53:42 +0100
Subject: [PATCH] fix: special char prevents downloading files with Webdav -
 EXO-65735 (#300)

---
 .../services/jcr/webdav/resource/GenericResource.java        | 5 +++--
 .../src/main/resources/conf/configuration.xml                | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/GenericResource.java b/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/GenericResource.java
index e88f05f525..05219ca54b 100644
--- a/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/GenericResource.java
+++ b/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/GenericResource.java
@@ -29,6 +29,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
@@ -256,8 +257,8 @@ public String decodeValue(String value) {
       do {
          currentValue = value;
          try {
-            value = URLDecoder.decode(value, "UTF-8");
-         } catch (UnsupportedEncodingException e) {
+            value = URLDecoder.decode(value, StandardCharsets.UTF_8);
+         } catch (IllegalArgumentException e) {
             LOG.warn("Unable to decode value: ", e.getMessage());
             return value;
          }
diff --git a/exo.jcr.ext.services/src/main/resources/conf/configuration.xml b/exo.jcr.ext.services/src/main/resources/conf/configuration.xml
index 55b1828222..1116b72ff4 100644
--- a/exo.jcr.ext.services/src/main/resources/conf/configuration.xml
+++ b/exo.jcr.ext.services/src/main/resources/conf/configuration.xml
@@ -50,9 +50,9 @@
     </component-plugin>
   </external-component-plugins>
 
-  <external-component-plugins profiles="cluster">
+  <external-component-plugins>
     <target-component>org.exoplatform.commons.api.persistence.DataInitializer</target-component>
-    <component-plugin>
+    <component-plugin profiles="cluster">
       <name>CommonsChangeLogsPlugin</name>
       <set-method>addChangeLogsPlugin</set-method>
       <type>org.exoplatform.commons.persistence.impl.ChangeLogsPlugin</type>