Author: remm
Date: Thu Nov 27 17:07:59 2014
New Revision: 1642190

URL: http://svn.apache.org/r1642190
Log:
Also encode primitive types.

Modified:
    tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1642190&r1=1642189&r2=1642190&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
Thu Nov 27 17:07:59 2014
@@ -544,14 +544,14 @@ public abstract class WsRemoteEndpointIm
             throw new 
IllegalArgumentException(sm.getString("wsRemoteEndpoint.nullHandler"));
         }
 
-        if (Util.isPrimitive(obj.getClass())) {
+        Encoder encoder = findEncoder(obj);
+
+        if (encoder == null && Util.isPrimitive(obj.getClass())) {
             String msg = obj.toString();
             sendStringByCompletion(msg, completion);
             return;
         }
 
-        Encoder encoder = findEncoder(obj);
-
         try {
             if (encoder instanceof Encoder.Text) {
                 String msg = ((Encoder.Text) encoder).encode(obj);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to