You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/11/24 16:35:58 UTC
svn commit: r1038649 - in
/geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web:
TradeAppServlet.java TradeServletAction.java
Author: xiaming
Date: Wed Nov 24 15:35:57 2010
New Revision: 1038649
URL: http://svn.apache.org/viewvc?rev=1038649&view=rev
Log:
DAYTRADER-51 fix NPE in trunk
Modified:
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeAppServlet.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeServletAction.java
Modified: geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeAppServlet.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeAppServlet.java?rev=1038649&r1=1038648&r2=1038649&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeAppServlet.java (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeAppServlet.java Wed Nov 24 15:35:57 2010
@@ -128,7 +128,11 @@ public class TradeAppServlet extends Htt
userID = req.getParameter("uid");
String passwd = req.getParameter("passwd");
String inScenario = req.getParameter("inScenario");
- tsAction.doLogin(ctx, req, resp, userID, passwd);
+ try {
+ tsAction.doLogin(ctx, req, resp, userID, passwd);
+ } catch (ServletException se) {
+ tsAction.doWelcome(ctx, req, resp, se.getMessage());
+ }
return;
} else if (action.equals("register")) {
userID = req.getParameter("user id");
Modified: geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeServletAction.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeServletAction.java?rev=1038649&r1=1038648&r2=1038649&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeServletAction.java (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeServletAction.java Wed Nov 24 15:35:57 2010
@@ -409,13 +409,14 @@ public class TradeServletAction {
return;
} else {
req.setAttribute("results", results
- + "\nCould not find account for + " + userID);
+ + "\nCould not find account for user=" + userID);
// log the exception with an error level of 3 which means,
// handled exception but would invalidate a automation run
Log.log(
"TradeServletAction.doLogin(...)",
"Error finding account for user " + userID + "",
"user entered a bad username or the database is not populated");
+ throw new NullPointerException("User does not exist or password is incorrect!");
}
} catch (java.lang.IllegalArgumentException e) { // this is a user
// error so I will
@@ -434,8 +435,8 @@ public class TradeServletAction {
} catch (Exception e) {
// log the exception with error page
throw new ServletException("TradeServletAction.doLogin(...)"
- + "Exception logging in user " + userID + "with password"
- + passwd, e);
+ + "Exception logging in user=" + userID + " with password="
+ + passwd + "; " + e.getMessage(), e);
}
requestDispatch(ctx, req, resp, userID, TradeConfig