[ofbiz-framework] branch release18.12 updated: Fixed: Double encoded urls are not being decoded (OFBIZ-11822)

[jleroux]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release18.12 by this push:
     new d2a976a  Fixed: Double encoded urls are not being decoded (OFBIZ-11822)
d2a976a is described below

commit d2a976a59225dabe9e5601ba50a9a54696d7de03
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Mon Jun 15 13:25:35 2020 +0200

    Fixed: Double encoded urls are not being decoded (OFBIZ-11822)
    
    This was broken by OFBIZ-10275
    
    Thanks: Alex Bodnaru
---
 framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java 
b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
index 7c7535b..a20e1f9 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
@@ -244,7 +244,7 @@ public class UtilCodec {
 
         public String decode(String original) {
             try {
-                canonicalize(original);
+                original = canonicalize(original);
                 return URLDecoder.decode(original, "UTF-8");
             } catch (UnsupportedEncodingException ee) {
                 Debug.logError(ee, module);