Fixed NullPointerException when requestind a Directory with a query string. Issue #1206. Reported by Ralph van Etten.

Author: thboileau

build/tmpl/text/changes.txt

@@ -4,6 +4,9 @@ Changes log
 ===========
 
 @version-full@ (@release-date@)
+    - Bugs fixed
+       - Fixed NullPointerException when requestind a Directory with a query string. Issue #1206.
+         Reported by Ralph van Etten.
 
 - 2.3.7 (03/14/2016)
     - Bugs fixed

modules/org.restlet.test/src/org/restlet/test/resource/DirectoryTestCase.java

@@ -58,6 +58,7 @@
 import org.restlet.data.Method;
 import org.restlet.data.Reference;
 import org.restlet.data.Status;
+import org.restlet.engine.Engine;
 import org.restlet.engine.header.HeaderConstants;
 import org.restlet.engine.io.IoUtils;
 import org.restlet.engine.util.ReferenceUtils;
@@ -156,6 +157,8 @@ public static void main(String[] args) throws Exception {
     File testDir;
 
     public void testDirectory() throws Exception {
+        Engine.getInstance().getRegisteredConverters().clear();
+        Engine.getInstance().registerDefaultConverters();
         // Create a new Restlet component
         Component clientComponent = new Component();
         clientComponent.getClients().add(FILE);
@@ -263,6 +266,11 @@ protected TestRequest header(Header header) {
             return this;
         }
 
+        protected TestRequest query(String name, String value) {
+            request.getResourceRef().addQueryParameter(name, value);
+            return this;
+        }
+
         protected Response handle(Method method) {
             final Response response = new Response(request);
             request.setMethod(method);
@@ -474,6 +482,13 @@ private void testDirectory(MyApplication application, Directory directory, Strin
                 .handle(PUT);
         assertEquals(SUCCESS_CREATED, response.getStatus());
 
+        response = new TestRequest(this.baseFileUrl)
+                .baseRef(this.webSiteURL)
+                .query("x", "y")
+                .handle(GET);
+        assertEquals(SUCCESS_OK, response.getStatus());
+        assertTrue(response.getEntityAsText().equals("this is test 3b"));
+
         // Test 4 : Try to get the representation of the new file
         response = new TestRequest(this.baseFileUrl)
                 .baseRef(this.webSiteURL)

modules/org.restlet/src/org/restlet/data/Protocol.java

@@ -24,6 +24,8 @@
 
 package org.restlet.data;
 
+import org.restlet.engine.util.StringUtils;
+
 /**
  * Protocol used by client and server connectors. Connectors enable the
  * communication between components by implementing standard protocols.
@@ -182,7 +184,7 @@ public final class Protocol {
     public static Protocol valueOf(String name) {
         Protocol result = null;
 
-        if ((name != null) && !name.equals("")) {
+        if (!StringUtils.isNullOrEmpty(name)) {
             if (name.equalsIgnoreCase(AJP.getSchemeName())) {
                 result = AJP;
             } else if (name.equalsIgnoreCase(CLAP.getSchemeName())) {

modules/org.restlet/src/org/restlet/engine/local/DirectoryServerResource.java

@@ -196,7 +196,7 @@ && getApplication().getTunnelService().isExtensionsTunnel()) {
                 Reference originalBaseRef = new Reference(this.originalRef);
                 originalBaseRef.setPath(getReference().getBaseRef().getPath());
                 this.originalRef.setBaseRef(originalBaseRef);
-                this.relativePart = this.originalRef.getRemainingPart();
+                this.relativePart = this.originalRef.getRemainingPart(false, false);
             }
         }