svn commit: r990507 - /tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java

[lr...@apache.org]

Author: lresende
Date: Sun Aug 29 08:47:38 2010
New Revision: 990507

URL: http://svn.apache.org/viewvc?rev=990507&view=rev
Log:
Merging changes from svn r988356: Test for null or empty servlet path info before redirecting to same URL with trailing /.

Modified:
    tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java

Modified: tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java?rev=990507&r1=990506&r2=990507&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java Sun Aug 29 08:47:38 2010
@@ -129,13 +129,14 @@ public class RESTBindingListenerServlet 
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         // Get the request path
-        String path = URLDecoder.decode(request.getPathInfo(), "UTF-8");
-        if (path.length() ==0) {
+        String pathInfo = request.getPathInfo();
+        if (pathInfo == null || pathInfo.length() == 0) {
             // Redirect to a URL ending with / to make relative hrefs work
             // relative to the served resource.
             response.sendRedirect(request.getRequestURL().append('/').toString());
             return;
         }
+        String path = URLDecoder.decode(pathInfo, "UTF-8");
 
         // Invoke the get operation on the service implementation
         Message requestMessage = messageFactory.createMessage();