Author: markt
Date: Wed Dec 19 22:22:59 2012
New Revision: 1424173
URL: http://svn.apache.org/viewvc?rev=1424173&view=rev
Log:
More NPE avoidance
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java?rev=1424173&r1=1424172&r2=1424173&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java Wed
Dec 19 22:22:59 2012
@@ -19,6 +19,7 @@ package org.apache.tomcat.websocket;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.nio.ByteBuffer;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -155,6 +156,7 @@ public class PojoMethodMapping {
}
}
if (!foundError) {
+ // TODO i18n
throw new IllegalArgumentException();
}
return result;
@@ -165,7 +167,12 @@ public class PojoMethodMapping {
UriTemplate template, String pathInfo, Session session,
Throwable throwable) {
Object[] result = new Object[pathParams.length];
- Map<String,String> pathValues = template.match(pathInfo);
+ Map<String,String> pathValues;
+ if (template != null && pathInfo != null) {
+ pathValues = template.match(pathInfo);
+ } else {
+ pathValues = Collections.EMPTY_MAP;
+ }
for (int i = 0; i < pathParams.length; i++) {
Class<?> type = pathParams[i].getType();
if (type.equals(Session.class)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
