svn commit: r730275 - in /activemq/camel/trunk/components/camel-restlet/src: main/java/org/apache/camel/component/restlet/MethodBasedRouter.java test/java/org/apache/camel/component/restlet/RestRouteBuilderTest.java

[wtam]

Author: wtam
Date: Tue Dec 30 16:11:48 2008
New Revision: 730275

URL: http://svn.apache.org/viewvc?rev=730275&view=rev
Log:
[CAMEL-1203] applied patch from Przemyslaw Budzik to set response code 404 when 
RestletConsumer can't find a handler

Modified:
    
activemq/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/MethodBasedRouter.java
    
activemq/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRouteBuilderTest.java

Modified: 
activemq/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/MethodBasedRouter.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/MethodBasedRouter.java?rev=730275&r1=730274&r2=730275&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/MethodBasedRouter.java
 (original)
+++ 
activemq/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/MethodBasedRouter.java
 Tue Dec 30 16:11:48 2008
@@ -26,6 +26,7 @@
 import org.restlet.data.Method;
 import org.restlet.data.Request;
 import org.restlet.data.Response;
+import org.restlet.data.Status;
 
 /**
  * A simple router that routes requests to target Restlets based on method. 
@@ -56,6 +57,7 @@
             if (LOG.isDebugEnabled()) {
                 LOG.debug("No route for request method: " + 
request.getMethod());
             }
+            response.setStatus(Status.CLIENT_ERROR_NOT_FOUND);
         }
     }
 

Modified: 
activemq/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRouteBuilderTest.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRouteBuilderTest.java?rev=730275&r1=730274&r2=730275&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRouteBuilderTest.java
 (original)
+++ 
activemq/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRouteBuilderTest.java
 Tue Dec 30 16:11:48 2008
@@ -27,6 +27,7 @@
 import org.restlet.data.Protocol;
 import org.restlet.data.Request;
 import org.restlet.data.Response;
+import org.restlet.data.Status;
 
 public class RestRouteBuilderTest extends ContextTestSupport {
     private static final String ID = "89531";
@@ -82,8 +83,9 @@
         Client client = new Client(Protocol.HTTP);
         Response response = client.handle(new Request(Method.POST, 
                 "http://localhost:8080/orders/99991/6";));
-        // expect null as no Restlet consumer to handle POST method
-        assertNull(response.getEntity().getText());
+        // expect error status as no Restlet consumer to handle POST method
+        assertEquals(Status.CLIENT_ERROR_NOT_FOUND, response.getStatus());
+        assertNotNull(response.getEntity().getText());
     }
 
 }