Author: kkolinko
Date: Mon Mar 18 04:38:05 2013
New Revision: 1457637
URL: http://svn.apache.org/r1457637
Log:
Review of r1457429:
Make logic more clear. No functional change.
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=1457637&r1=1457636&r2=1457637&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Mon Mar 18 04:38:05 2013
@@ -174,7 +174,7 @@ public class PojoMethodMapping {
if (m == null) {
return new PojoPathParam[0];
}
- boolean foundThrowable = !isOnError;
+ boolean foundThrowable = false;
Class<?>[] types = m.getParameterTypes();
Annotation[][] paramsAnnotations = m.getParameterAnnotations();
PojoPathParam[] result = new PojoPathParam[types.length];
@@ -201,7 +201,7 @@ public class PojoMethodMapping {
}
}
}
- if (!foundThrowable) {
+ if (isOnError && !foundThrowable) {
throw new IllegalArgumentException(sm.getString(
"pojoMethodMapping.onErrorNoThrowable",
m.getName(), m.getClass().getName()));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
