Author: schultz
Date: Wed Jun 6 00:26:15 2012
New Revision: 1346683
URL: http://svn.apache.org/viewvc?rev=1346683&view=rev
Log:
Clean-up: avoid NPE and immediate catch when init parameter does not exist.
Also do not assign default value unless necessary.
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java?rev=1346683&r1=1346682&r2=1346683&view=diff
==============================================================================
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
Wed Jun 6 00:26:15 2012
@@ -42,11 +42,17 @@ public class EchoMessage extends WebSock
public int getInitParameterIntValue(String name, int defaultValue) {
String val = this.getInitParameter(name);
- int result = defaultValue;
- try {
- result = Integer.parseInt(val);
- }catch (Exception x) {
+ int result;
+ if(null != val) {
+ try {
+ result = Integer.parseInt(val);
+ }catch (Exception x) {
+ result = defaultValue;
+ }
+ } else {
+ result = defaultValue;
}
+
return result;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
