[ofbiz-framework] branch trunk updated (ee8e959 -> 61ade2a)

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

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


    from ee8e959  Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/ofbiz-framework into trunk Git merge to be able to amend my last commit missing info in message
     new 0741c71  Fixed: SeoContextFilter.java is not able to handle query strings (OFBIZ-11278)
     new 09e583b  Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/ofbiz-framework into trunk Git merge to be able to amend my last commit missing info in message
     new 61ade2a  Improved: SeoContextFilter.java is not able to handle query strings (OFBIZ-11278)

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../main/java/org/apache/ofbiz/product/category/SeoContextFilter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

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

commit 0741c7148ad12ff646763b89cfb5ff9683699316
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Sat Nov 9 14:25:00 2019 +0100

    Fixed: SeoContextFilter.java is not able to handle query strings
    (OFBIZ-11278)
   
    While working on OFBIZ-9804 (verification email for Newsletter) I was confronted
    with misc. issues. One of them was that SeoContextFilter.java was not handling
    query strings.
   
    This fixes it

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

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

commit 09e583b554b6524d3f0b9f66223ea33b0d663e0a
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Sat Nov 9 21:47:12 2019 +0100

    Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/ofbiz-framework into trunk
    Git merge to be able to amend my last commit missing info in message

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

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

commit 61ade2add5af585ec873280da8051bdb1f139c71
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Sun Nov 10 10:43:07 2019 +0100

    Improved: SeoContextFilter.java is not able to handle query strings
    (OFBIZ-11278)
   
    Removes a trailing blank and uses empty to check request::getParameterMap result
   
    Thanks: Mathieu to spot "empty to check request::getParameterMap result"
---
 .../main/java/org/apache/ofbiz/product/category/SeoContextFilter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java
index b7cab04..de9030f 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java
@@ -101,7 +101,7 @@ public class SeoContextFilter implements Filter {
         String uri = httpRequest.getRequestURI();
 
         Map<String, String[]> parameterMap =request.getParameterMap();
-        if (parameterMap != null) {
+        if (!parameterMap.isEmpty()) {
             List<BasicNameValuePair> params = new ArrayList<BasicNameValuePair>();
             request.getParameterMap().forEach((name, values) -> {
                 for(String value : values) {
@@ -109,7 +109,7 @@ public class SeoContextFilter implements Filter {
                 }
             });
             String queryString = URLEncodedUtils.format(params, Charset.forName("UTF-8"));
-            uri = uri + "?" + queryString;
+            uri = uri + "?" + queryString;
         }
         
         boolean forwarded = forwardUri(httpResponse, uri);