Author: markt
Date: Mon Jul 30 11:13:30 2007
New Revision: 561077
URL: http://svn.apache.org/viewvc?view=rev&rev=561077
Log:
Port fix for 39212. Possible NPE and redundant code.
Modified:
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
tomcat/tc6.0.x/trunk/webapps/examples/jsp/sessions/carts.jsp
Modified:
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/sessions/DummyCart.java?view=diff&rev=561077&r1=561076&r2=561077
==============================================================================
---
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
(original)
+++
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
Mon Jul 30 11:13:30 2007
@@ -16,7 +16,6 @@
*/
package sessions;
-import javax.servlet.http.*;
import java.util.Vector;
public class DummyCart {
@@ -46,13 +45,10 @@
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);
Modified: tomcat/tc6.0.x/trunk/webapps/examples/jsp/sessions/carts.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/jsp/sessions/carts.jsp?view=diff&rev=561077&r1=561076&r2=561077
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/examples/jsp/sessions/carts.jsp (original)
+++ tomcat/tc6.0.x/trunk/webapps/examples/jsp/sessions/carts.jsp Mon Jul 30
11:13:30 2007
@@ -20,7 +20,7 @@
<jsp:setProperty name="cart" property="*" />
<%
- cart.processRequest(request);
+ cart.processRequest();
%>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
