Author: jsdelfino
Date: Tue Sep 18 00:04:56 2007
New Revision: 576736

URL: http://svn.apache.org/viewvc?rev=576736&view=rev
Log:
Fix for TUSCANY-1736, add a check for null request path in the Feed binding 
listener servlet, to fix an NPE in the store sample.

Modified:
    
incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java

Modified: 
incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java?rev=576736&r1=576735&r2=576736&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
 Tue Sep 18 00:04:56 2007
@@ -445,23 +445,24 @@
         // Get the request path
         String path = request.getPathInfo();
 
-        if (path.startsWith("/")) {
-            String id = path.substring(1);
+        String id;
+        if (path != null && path.startsWith("/")) {
+            id = path.substring(1);
+        } else {
+            id = "";
+        }
 
-            // Delete a specific entry from the collection
-            Message requestMessage = messageFactory.createMessage();
-            requestMessage.setBody(new Object[] {id});
-            Message responseMessage = deleteInvoker.invoke(requestMessage);
-            if (responseMessage.isFault()) {
-                Object body = responseMessage.getBody();
-                if (body instanceof NotFoundException) {
-                    response.sendError(HttpServletResponse.SC_NOT_FOUND);
-                } else {
-                    throw new 
ServletException((Throwable)responseMessage.getBody());
-                }
+        // Delete a specific entry from the collection
+        Message requestMessage = messageFactory.createMessage();
+        requestMessage.setBody(new Object[] {id});
+        Message responseMessage = deleteInvoker.invoke(requestMessage);
+        if (responseMessage.isFault()) {
+            Object body = responseMessage.getBody();
+            if (body instanceof NotFoundException) {
+                response.sendError(HttpServletResponse.SC_NOT_FOUND);
+            } else {
+                throw new 
ServletException((Throwable)responseMessage.getBody());
             }
-        } else {
-            response.sendError(HttpServletResponse.SC_NOT_FOUND);
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to