svn commit: r1735812 - in /ofbiz/branches/release15.12: ./ applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java

Author: jleroux
Date: Sat Mar 19 21:18:06 2016
New Revision: 1735812

URL: http://svn.apache.org/viewvc?rev=1735812&view=rev
Log:
"Applied fix from trunk for revision: 1735773"
------------------------------------------------------------------------
r1735773 | deepak | 2016-03-19 14:31:02 +0100 (sam. 19 mars 2016) | 1 ligne

(OFBIZ-5918) Fixed NPE for ecommerce/products url, If user enter invalid url ecommerce/products then redirect it to main.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 19 21:18:06 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773

Modified: ofbiz/branches/release15.12/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java?rev=1735812&r1=1735811&r2=1735812&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java (original)
+++ ofbiz/branches/release15.12/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java Sat Mar 19 21:18:06 2016
@@ -82,6 +82,11 @@ public class CatalogUrlServlet extends H
 
         String productId = null;
         String categoryId = null;
+
+        if (pathElements == null) {
+            RequestDispatcher rd = request.getRequestDispatcher("/" + CONTROL_MOUNT_POINT + "/main");
+            rd.forward(request, response);
+        } else {
         try {
             String lastPathElement = pathElements.get(pathElements.size() - 1);
             if (lastPathElement.startsWith("p_")) {
@@ -146,6 +151,7 @@ public class CatalogUrlServlet extends H
 
         RequestDispatcher rd = request.getRequestDispatcher("/" + CONTROL_MOUNT_POINT + "/" + (productId != null ? PRODUCT_REQUEST : CATEGORY_REQUEST));
         rd.forward(request, response);
+        }
     }
 
     /**