/*
 * See the NOTICE file distributed with this work for additional
 * information regarding copyright ownership.
 *
 * This is free software; you can redistribute it and/or modify it
 * under the terms of the GNU Lesser General Public License as
 * published by the Free Software Foundation; either version 2.1 of
 * the License, or (at your option) any later version.
 *
 * This software is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this software; if not, write to the Free
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */
package org.xwiki.velocity.tools;

import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URLEncodedUtils;

/**
 * Velocity tool to parse URL parts.
 * 
 * @version $Id$
 * @since 6.3M1
 */
public class URLTool
{
    /**
     * Parse a query string into a map of key-value pairs.
     * 
     * @param query query string to be parsed
     * @return a mapping of parameter names to values suitable e.g. to pass into {@link EscapeTool#url(Map)}
     */
    public Map<String, List<String>> parseQuery(String query)
    {
        Map<String, List<String>> queryParams = new LinkedHashMap<>();
        for (NameValuePair params : URLEncodedUtils.parse(query, StandardCharsets.UTF_8)) {
            String name = params.getName();
            List<String> values = queryParams.get(name);
            if (values == null) {
                values = new ArrayList<>();
                queryParams.put(name, values);
            }
            values.add(params.getValue());
        }
        return queryParams;
    }
}

@@ -1640,24 +1640,57 @@
 ashMap%3C%3E();%0A
+        if (query != null) %7B%0A    
         for 
@@ -1781,16 +1781,20 @@
         
+    
 String n
@@ -1829,16 +1829,20 @@
         
+ 
+   
 List%3CStr
@@ -1886,24 +1886,28 @@
             
+    
 if (values =
@@ -1928,24 +1928,28 @@
             
+   
+ 
 values = new
@@ -1960,24 +1960,28 @@
 ayList%3C%3E();%0A
+    
             
@@ -2015,16 +2015,20 @@
 alues);%0A
+    
         
@@ -2041,24 +2041,28 @@
             
+    
 values.add(p
@@ -2080,16 +2080,30 @@
 lue());%0A
+            %7D%0A
         

Upgrade to httpclient 4.4