Fixed current application thread constant when issuing internal calls. Issue #1183.

Author: thboileau

build/tmpl/text/changes.txt

@@ -22,6 +22,7 @@ Changes log
          Reported by Ralph van Etten.
        - Removed useless log trace for HTTP_OAUTH_BEARER request with raw value. Issue #1152.
        - Cors filter does not take into account PATCH method. Issue #1178.
+       - Fixed current application thread constant when issuing internal calls. Issue #1183.
     - Enhancements
        - Added Request and response attributes to the ResourceException class.
        - ServerResource traces Exception in the doCatch method with SEVERE log

modules/org.restlet.test/src/org/restlet/test/engine/ApplicationContextTestCase.java

@@ -0,0 +1,80 @@
+package org.restlet.test.engine;
+
+import org.restlet.Application;
+import org.restlet.Component;
+import org.restlet.Restlet;
+import org.restlet.data.MediaType;
+import org.restlet.data.Protocol;
+import org.restlet.representation.Representation;
+import org.restlet.resource.ClientResource;
+import org.restlet.resource.Get;
+import org.restlet.resource.ServerResource;
+import org.restlet.routing.Router;
+import org.restlet.test.RestletTestCase;
+
+/**
+ * Tests that when issuing internal calls, the application context is kept intact in the caller server resource.
+ */
+public class ApplicationContextTestCase extends RestletTestCase {
+
+    public static class InternalApplication extends Application {
+
+        @Override
+        public Restlet createInboundRoot() {
+            Router router = new Router();
+            router.attach("/test", InternalResource.class);
+            return router;
+        }
+    }
+
+    public static class InternalResource extends ServerResource {
+        @Get
+        public String hello() {
+            return "hello, world";
+        }
+    }
+
+    public static class WebApiApplication extends Application {
+        @Override
+        public Restlet createInboundRoot() {
+            Router router = new Router();
+            router.attach("/test", WebApiResource.class);
+            return router;
+        }
+    }
+
+    public static class WebApiResource extends ServerResource {
+        @Get
+        public String hello() {
+            // issuing internal calls
+            new ClientResource("riap://component/internal/test").get();
+            // returns the current application
+            return Application.getCurrent().getClass().getSimpleName();
+        }
+    }
+
+    private Component component;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        this.component = new Component();
+        this.component.getServers().add(Protocol.HTTP, TEST_PORT);
+
+        component.getDefaultHost().attach("/api", new WebApiApplication());
+        component.getInternalRouter().attach("/internal", new InternalApplication());
+
+        component.start();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        component.stop();
+    }
+
+    public void testApplicationContext() throws Exception {
+        ClientResource res = new ClientResource("http://localhost:" + TEST_PORT + "/api/test");
+        Representation rep = res.get(MediaType.TEXT_PLAIN);
+        assertEquals("WebApiApplication", rep.getText());
+    }
+}

modules/org.restlet/src/org/restlet/engine/application/ApplicationHelper.java

@@ -68,11 +68,17 @@ public ApplicationHelper(Application application) {
      */
     @Override
     public void handle(Request request, Response response) {
+        Application current = Application.getCurrent();
         // Save the current application
         Application.setCurrent(getHelped());
 
         // Actually handle call
-        super.handle(request, response);
+        try {
+            super.handle(request, response);
+        } finally {
+            // restaure the current application
+            Application.setCurrent(current);
+        }
     }
 
     /**