svn commit: r1070784 - in /camel/trunk/components/camel-restlet/src: main/java/org/apache/camel/component/restlet/ test/java/org/apache/camel/component/restlet/

[davsclaus]

Author: davsclaus
Date: Tue Feb 15 06:21:55 2011
New Revision: 1070784

URL: http://svn.apache.org/viewvc?rev=1070784&view=rev
Log:
CAMEL-3666: Content-Type can be optional. Thanks to Fernando for the patch.

Modified:
    
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
    
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java
    
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerConcurrentTest.java

Modified: 
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java?rev=1070784&r1=1070783&r2=1070784&view=diff
==============================================================================
--- 
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
 (original)
+++ 
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
 Tue Feb 15 06:21:55 2011
@@ -79,7 +79,7 @@ public class DefaultRestletBinding imple
         }
 
         // only deal with the form if the content type is 
"application/x-www-form-urlencoded"
-        if 
(request.getEntity().getMediaType().equals(MediaType.APPLICATION_WWW_FORM)) {
+        if (request.getEntity().getMediaType() != null && 
request.getEntity().getMediaType().equals(MediaType.APPLICATION_WWW_FORM)) {
             Form form = new Form(request.getEntity());
             for (Map.Entry<String, String> entry : 
form.getValuesMap().entrySet()) {
                 if (entry.getValue() == null) {

Modified: 
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java?rev=1070784&r1=1070783&r2=1070784&view=diff
==============================================================================
--- 
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java
 (original)
+++ 
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java
 Tue Feb 15 06:21:55 2011
@@ -42,9 +42,7 @@ public class RestletPostContentTest exte
             public void configure() throws Exception {
                 
from("restlet:http://localhost:9080/users/{username}?restletMethod=POST";)
                     .process(new SetUserProcessor());
-                
             }
-            
         };
     }
     

Modified: 
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerConcurrentTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerConcurrentTest.java?rev=1070784&r1=1070783&r2=1070784&view=diff
==============================================================================
--- 
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerConcurrentTest.java
 (original)
+++ 
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerConcurrentTest.java
 Tue Feb 15 06:21:55 2011
@@ -62,7 +62,7 @@ public class RestletProducerConcurrentTe
                     headers.put("username", "davsclaus");
                     headers.put("id", index);
                     return template
-                        
.requestBodyAndHeaders("restlet:http://localhost:9080/users/davsclaus/"; + index 
+ "?restletMethod=POST",
+                        
.requestBodyAndHeaders("restlet:http://localhost:9080/users/davsclaus/"; + index 
+ "?restletMethod=GET",
                                                null, headers, String.class);
                 }
             });
@@ -87,7 +87,7 @@ public class RestletProducerConcurrentTe
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                
from("restlet:http://localhost:9080/users/{username}/{id}?restletMethod=POST";)
+                
from("restlet:http://localhost:9080/users/{username}/{id}?restletMethod=GET";)
                     .to("log:inbox").process(new Processor() {
                         public void process(Exchange exchange) throws 
Exception {
                             String index = exchange.getIn().getHeader("id", 
String.class);