Port fix for 39212. Possible NPE and redundant code.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@561077 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/webapps/examples/WEB-INF/classes/sessions/DummyCart.java b/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
index bc190d8..3e5023a 100644 (file)
--- a/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
+++ b/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
@@ -16,7 +16,6 @@
 */
 package sessions;
 
-import javax.servlet.http.*;
 import java.util.Vector;
 
 public class DummyCart {
@@ -46,13 +45,10 @@ public class DummyCart {
         return s;
     }
     
-    public void processRequest(HttpServletRequest request) {
+    public void processRequest() {
         // null value for submit - user hit enter instead of clicking on 
         // "add" or "remove"
-        if (submit == null) 
-            addItem(item);
-
-        if (submit.equals("add"))
+        if (submit == null || submit.equals("add"))
             addItem(item);
         else if (submit.equals("remove")) 
             removeItem(item);

diff --git a/webapps/examples/jsp/sessions/carts.jsp b/webapps/examples/jsp/sessions/carts.jsp
index c1d2721..187d501 100644 (file)
--- a/webapps/examples/jsp/sessions/carts.jsp
+++ b/webapps/examples/jsp/sessions/carts.jsp
@@ -20,7 +20,7 @@
 
 <jsp:setProperty name="cart" property="*" />
 <%
-       cart.processRequest(request);
+       cart.processRequest();
 %>