From 07466cafee5c37ca666e1709f36d1887506174f2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini <orsinije@fr.ibm.com>
Date: Thu, 19 Oct 2017 00:48:45 +0200
Subject: [PATCH] fixed retrieval of the redirect url when there is & in the
 redirected url

---
 war/src/main/java/pnews/servlet/Pnews.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/war/src/main/java/pnews/servlet/Pnews.java b/war/src/main/java/pnews/servlet/Pnews.java
index 79ee9f6..1b9a4f7 100644
--- a/war/src/main/java/pnews/servlet/Pnews.java
+++ b/war/src/main/java/pnews/servlet/Pnews.java
@@ -24,28 +24,33 @@ import pnews.Article;
 import pnews.Category;
 
 public class Pnews extends HttpServlet {
+        private static final String CLASS_NAME = Pnews.class.getName();
         private static final Logger LOG = Logger.getLogger(Pnews.class.getName());
         private static final long serialVersionUID = 1L;
         private static final ArticleProvider provider = ArticleProvider.singleton;
 
         private static String getQueryParameter(HttpServletRequest rq, String key)
                         throws UnsupportedEncodingException {
+                final String METHOD_NAME="getQueryParameter";                
                 String[] params;
                 int idx;
                 String q;
+                
+                
+                LOG.entering(CLASS_NAME, METHOD_NAME, new Object[] { rq, key} );
 
                 q = rq.getQueryString();
 
                 if (q == null)
                         return null;
 
-                params = URLDecoder.decode(q, "UTF-8").split("&");
+                params = q.split("&");
 
                 for (String p: params) {
                         idx = p.indexOf('=');
 
                         if (idx > 1 && p.substring(0, idx).equals(key))
-                                return p.substring(idx + 1);
+                                return URLDecoder.decode(p.substring(idx + 1), "UTF-8");
                 }
 
                 return null;
@@ -55,7 +60,7 @@ public class Pnews extends HttpServlet {
                 String redirectURL;
                 Article a;
 
-                LOG.entering(Pnews.class.getName(), "redirect");
+                LOG.entering(Pnews.class.getName(), "redirect", new Object[] { rq, rp });
 
                 try {
                         redirectURL = getQueryParameter(rq, "url");
-- 
2.7.4