Author: markt
Date: Thu Jun 27 10:54:54 2013
New Revision: 1497294
URL: http://svn.apache.org/r1497294
Log:
Simplify a little
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java?rev=1497294&r1=1497293&r2=1497294&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Thu Jun 27 10:54:54 2013
@@ -515,15 +515,15 @@ public class PojoMethodMapping {
Set<MessageHandler> results = new HashSet<>(2);
if (indexBoolean == -1) {
// Basic
- if (indexString != -1) {
+ if (indexString != -1 || indexPrimitive != -1) {
MessageHandler mh = new PojoMessageHandlerWholeText(pojo,
m,
- session, config, null, params, indexString, false,
+ session, config, null, params, indexPayload, false,
indexSession, maxMessageSize);
results.add(mh);
- } else if (indexPrimitive != -1) {
+ } else if (indexReader != -1) {
MessageHandler mh = new PojoMessageHandlerWholeText(pojo,
m,
- session, config, null, params, indexPrimitive,
- false, indexSession, maxMessageSize);
+ session, config, null, params, indexReader, true,
+ indexSession, maxMessageSize);
results.add(mh);
} else if (indexByteArray != -1) {
MessageHandler mh = new PojoMessageHandlerWholeBinary(pojo,
@@ -540,11 +540,6 @@ public class PojoMethodMapping {
m, session, config, null, params, indexInputStream,
true, indexSession, true, maxMessageSize);
results.add(mh);
- } else if (indexReader != -1) {
- MessageHandler mh = new PojoMessageHandlerWholeText(pojo,
m,
- session, config, null, params, indexReader, true,
- indexSession, maxMessageSize);
- results.add(mh);
} else if (decoderMatch.hasMatches()) {
if (decoderMatch.getBinaryDecoders().size() > 0) {
MessageHandler mh = new PojoMessageHandlerWholeBinary(
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
