Author: ningjiang
Date: Fri Sep 2 03:46:37 2011
New Revision: 1164342
URL: http://svn.apache.org/viewvc?rev=1164342&view=rev
Log:
CAMEL-4324 Fixed the issue of losting the response body
Modified:
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletOperationException.java
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletExceptionResponseTest.java
Modified:
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletOperationException.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletOperationException.java?rev=1164342&r1=1164341&r2=1164342&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletOperationException.java
(original)
+++
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletOperationException.java
Fri Sep 2 03:46:37 2011
@@ -35,7 +35,7 @@ public class RestletOperationException e
public RestletOperationException(String uri, int statusCode, String
statusText, String location, Map<String, String> responseHeaders,
String responseBody) {
super("Restlet operation failed invoking " + uri + " with statusCode:
" + statusCode + (location != null ? ", redirectLocation: " + location
- : ""));
+ : "" + " /n responseBody:" + responseBody));
this.uri = uri;
this.statusCode = statusCode;
this.statusText = statusText;
Modified:
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java?rev=1164342&r1=1164341&r2=1164342&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
(original)
+++
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
Fri Sep 2 03:46:37 2011
@@ -171,7 +171,16 @@ public class RestletProducer extends Def
String uri = exchange.getFromEndpoint().getEndpointUri();
String statusText = response.getStatus().getDescription();
Map<String, String> headers = parseResponseHeaders(response, exchange);
- String copy = response.toString();
+ String copy;
+ if (response.getEntity() != null) {
+ try {
+ copy = response.getEntity().getText();
+ } catch (Exception ex) {
+ copy = ex.toString();
+ }
+ } else {
+ copy = response.toString();
+ }
if (responseCode >= 300 && responseCode < 400) {
String redirectLocation;
if (response.getStatus().isRedirection()) {
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletExceptionResponseTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletExceptionResponseTest.java?rev=1164342&r1=1164341&r2=1164342&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletExceptionResponseTest.java
(original)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletExceptionResponseTest.java
Fri Sep 2 03:46:37 2011
@@ -17,6 +17,7 @@
package org.apache.camel.component.restlet;
import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.http.HttpResponse;
@@ -26,7 +27,7 @@ import org.junit.Test;
/**
*
- * @version
+ * @version
*/
public class RestletExceptionResponseTest extends RestletTestSupport {
@@ -54,4 +55,20 @@ public class RestletExceptionResponseTes
assertTrue(body.contains("IllegalArgumentException"));
assertTrue(body.contains("Damn something went wrong"));
}
+
+ @Test
+ public void testRestletProducerGetExceptionResponse() throws Exception {
+ Exchange exchange = template.request(
+ "restlet:http://localhost:" + portNum +
"/users/tester?restletMethod=POST",
+ new Processor() {
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setBody("<order foo='1'/>");
+ }
+ });
+ RestletOperationException exception = (RestletOperationException)
exchange.getException();
+ String body = exception.getResponseBody();
+ assertTrue(body.contains("IllegalArgumentException"));
+ assertTrue(body.contains("Damn something went wrong"));
+ }
}
\ No newline at end of file