svn commit: r782159 - /incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java

[lindner]

Author: lindner
Date: Fri Jun  5 23:00:23 2009
New Revision: 782159

URL: http://svn.apache.org/viewvc?rev=782159&view=rev
Log:
SHINDIG-1075 | DefaultHandlerRegistry.getRestHandler throws an NPE for 
unregistered paths

Modified:
    
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java

Modified: 
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java?rev=782159&r1=782158&r2=782159&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
 (original)
+++ 
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
 Fri Jun  5 23:00:23 2009
@@ -140,18 +140,20 @@
    */
   public RestHandler getRestHandler(String path, String method) {
     method = method.toUpperCase();
-    if (path.startsWith("/")) {
-      path = path.substring(1);
-    }
-    String[] pathParts = path.split("/");
-    Map<String, SortedSet<RestPath>> methods = 
serviceMethodPathMap.get(pathParts[0]);
-    if (methods != null) {
-      SortedSet<RestPath> paths = methods.get(method);
-      if (paths != null) {
-        for (RestPath restPath : paths) {
-          RestHandler handler = restPath.accept(pathParts);
-          if (handler != null) {
-            return handler;
+    if (path != null) {
+      if (path.startsWith("/")) {
+        path = path.substring(1);
+      }
+      String[] pathParts = path.split("/");
+      Map<String, SortedSet<RestPath>> methods = 
serviceMethodPathMap.get(pathParts[0]);
+      if (methods != null) {
+        SortedSet<RestPath> paths = methods.get(method);
+        if (paths != null) {
+          for (RestPath restPath : paths) {
+            RestHandler handler = restPath.accept(pathParts);
+            if (handler != null) {
+              return handler;
+            }
           }
         }
       }