Author: markt Date: Mon Jul 30 11:11:06 2007 New Revision: 561076 URL: http://svn.apache.org/viewvc?view=rev&rev=561076 Log: Fix 39212. Possible NPE and redundant code.
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/examples/WEB-INF/classes/sessions/DummyCart.java tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/examples/sessions/carts.jsp Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=561076&r1=561075&r2=561076 ============================================================================== --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Mon Jul 30 11:11:06 2007 @@ -74,6 +74,10 @@ Fix XSS security vulnerabilities (CVE-2007-2449) in the examples. Reported by Toshiharu Sugiyama. (markt) </fix> + <fix> + <bug>39212</bug>: Fix possible NPE in DummyCart example and remove + redundant code. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote"> Modified: tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/examples/WEB-INF/classes/sessions/DummyCart.java URL: http://svn.apache.org/viewvc/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/examples/WEB-INF/classes/sessions/DummyCart.java?view=diff&rev=561076&r1=561075&r2=561076 ============================================================================== --- tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/examples/WEB-INF/classes/sessions/DummyCart.java (original) +++ tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/examples/WEB-INF/classes/sessions/DummyCart.java Mon Jul 30 11:11:06 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/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/examples/sessions/carts.jsp URL: http://svn.apache.org/viewvc/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/examples/sessions/carts.jsp?view=diff&rev=561076&r1=561075&r2=561076 ============================================================================== --- tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/examples/sessions/carts.jsp (original) +++ tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/examples/sessions/carts.jsp Mon Jul 30 11:11:06 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]