commit 44904a72e94db6d42c6985ebcb8a7c913041ef34
author Udo Schnurpfeil <lofwyr@apache.org> Fri Sep 09 12:00:56 2016 +0000
committer Udo Schnurpfeil <lofwyr@apache.org> Fri Sep 09 12:00:56 2016 +0000
tree 7ec994a78063e188901a7708e494a7802b951f89
parent c60b278b450b11ffbd2cd15b7bab9e51c96b44d2

TOBAGO-1598: Encoding of parameter <f:param> will not rendered correctly

core/src/main/java/org/apache/myfaces/tobago/renderkit/html/CommandRendererHelper.java

diff --git a/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/CommandRendererHelper.java b/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/CommandRendererHelper.java
index 002366f..ad1c37b 100644
--- a/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/CommandRendererHelper.java
+++ b/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/CommandRendererHelper.java
@@ -23,16 +23,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.tobago.TobagoConstants;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_ACTION_LINK;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_ACTION_ONCLICK;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_DEFAULT_COMMAND;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_DISABLED;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_POPUP_CLOSE;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_RESOURCE;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TARGET;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TRANSITION;
-import static org.apache.myfaces.tobago.TobagoConstants.FACET_CONFIRMATION;
-import static org.apache.myfaces.tobago.TobagoConstants.FACET_POPUP;
 import org.apache.myfaces.tobago.component.ComponentUtil;
 import org.apache.myfaces.tobago.component.UIPopup;
 import org.apache.myfaces.tobago.context.ClientProperties;
@@ -47,10 +37,22 @@
 import javax.faces.component.ValueHolder;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
-import java.net.URLDecoder;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.Arrays;
 import java.util.List;
 
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_ACTION_LINK;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_ACTION_ONCLICK;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_DEFAULT_COMMAND;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_DISABLED;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_POPUP_CLOSE;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_RESOURCE;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TARGET;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TRANSITION;
+import static org.apache.myfaces.tobago.TobagoConstants.FACET_CONFIRMATION;
+import static org.apache.myfaces.tobago.TobagoConstants.FACET_POPUP;
+
 public class CommandRendererHelper {
 
   private static final Log LOG = LogFactory.getLog(CommandRendererHelper.class);
@@ -229,8 +231,14 @@
           builder.append(parameter.getName());
           builder.append("=");
           Object value = parameter.getValue();
-          // TODO encoding
-          builder.append(value != null ? URLDecoder.decode(value.toString()) : null);
+          if (value != null) {
+            final String characterEncoding = facesContext.getResponseWriter().getCharacterEncoding();
+            try {
+              builder.append(URLEncoder.encode(value.toString(), characterEncoding));
+            } catch (UnsupportedEncodingException e) {
+              LOG.error("", e);
+            }
+          }
         }
       }
       url = builder.toString();