Author: markt
Date: Mon Mar 25 09:39:20 2013
New Revision: 1460563
URL: http://svn.apache.org/r1460563
Log:
Types won't always be exact matches. Use isAssignableFrom
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1460563&r1=1460562&r2=1460563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Mon Mar 25
09:39:20 2013
@@ -151,19 +151,19 @@ public class WsSession implements Sessio
Type t = Util.getMessageType(listener);
- if (t.equals(String.class)) {
+ if (String.class.isAssignableFrom((Class<?>) t)) {
if (textMessageHandler != null) {
throw new IllegalStateException(
sm.getString("wsSession.duplicateHandlerText"));
}
textMessageHandler = listener;
- } else if (t.equals(ByteBuffer.class)) {
+ } else if (ByteBuffer.class.isAssignableFrom((Class<?>) t)) {
if (binaryMessageHandler != null) {
throw new IllegalStateException(
sm.getString("wsSession.duplicateHandlerBinary"));
}
binaryMessageHandler = listener;
- } else if (t.equals(PongMessage.class)) {
+ } else if (PongMessage.class.isAssignableFrom((Class<?>) t)) {
if (pongMessageHandler != null) {
throw new IllegalStateException(
sm.getString("wsSession.duplicateHandlerPong"));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
