Author: kkolinko
Date: Mon Nov 18 12:29:37 2013
New Revision: 1543016
URL: http://svn.apache.org/r1543016
Log:
Merged r1542841 from tomcat/trunk:
Fix a FindBugs warning.
Throw NPE rather than triggering one.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1542841
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java?rev=1543016&r1=1543015&r2=1543016&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Mon Nov 18 12:29:37 2013
@@ -480,7 +480,7 @@ public final class Room {
*/
private void sendRoomMessage(MessageType type, String content) {
if (content == null || type == null)
- throw null;
+ throw new NullPointerException();
String completeMsg = String.valueOf(type.flag) + content;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
