Return-Path: 
 <dev-return-133964-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
X-Original-To: apmail-tomcat-dev-archive@www.apache.org
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 32EA2E0C0
	for <apmail-tomcat-dev-archive@www.apache.org>;
 Sat, 15 Dec 2012 19:58:06 +0000 (UTC)
Received: (qmail 97899 invoked by uid 500); 15 Dec 2012 19:58:05 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 97822 invoked by uid 500); 15 Dec 2012 19:58:05 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 97813 invoked by uid 99); 15 Dec 2012 19:58:05 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Dec 2012 19:58:05 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Dec 2012 19:58:03 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 369D72388A64
	for <dev@tomcat.apache.org>; Sat, 15 Dec 2012 19:57:42 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1422334 -
 /tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
Date: Sat, 15 Dec 2012 19:57:41 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121215195742.369D72388A64@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: markt
Date: Sat Dec 15 19:57:41 2012
New Revision: 1422334

URL: http://svn.apache.org/viewvc?rev=1422334&view=rev
Log:
Avoid NPE

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=1422334&r1=1422333&r2=1422334&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java Sat Dec 15 19:57:41 2012
@@ -117,7 +117,7 @@ public class PojoMethodMapping {
             Session session) {
         Set<MessageHandler> result = new HashSet<>();
         for (MessageMethod messageMethod : onMessage) {
-            result.add(messageMethod.getMessageHandler(pojo, pathInfo,session));
+            result.add(messageMethod.getMessageHandler(pojo, pathInfo, session));
         }
         return result;
     }
@@ -331,7 +331,12 @@ public class PojoMethodMapping {
                 Session session) {
             Object[] params = new Object[m.getParameterTypes().length];
 
-            Map<String,String> pathParams = template.match(pathInfo);
+            Map<String,String> pathParams;
+            if (template == null) {
+                pathParams = new HashMap<>();
+            } else {
+                pathParams = template.match(pathInfo);
+            }
 
             for (Map.Entry<Integer,PathParam> entry :
                     indexPathParams.entrySet()) {



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