fix: special char prevents downloading files with Webdav - EXO-65735 (#…

…300)
exoplatform · Aug 3, 2023 · fa2ee3e · fa2ee3e
1 parent 07eefdc
commit fa2ee3e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...nt.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/GenericResource.java b/...nt.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
@@ -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>