You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/09/19 20:12:25 UTC
svn commit: r1172736 - in /camel/branches/camel-2.8.x: ./
components/camel-restlet/src/main/java/org/apache/camel/component/restlet/
components/camel-restlet/src/test/java/org/apache/camel/component/restlet/
Author: dkulp
Date: Mon Sep 19 18:12:25 2011
New Revision: 1172736
URL: http://svn.apache.org/viewvc?rev=1172736&view=rev
Log:
Merged revisions 1164342 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1164342 | ningjiang | 2011-09-01 23:46:37 -0400 (Thu, 01 Sep 2011) | 1 line
CAMEL-4324 Fixed the issue of losting the response body
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletOperationException.java
camel/branches/camel-2.8.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
camel/branches/camel-2.8.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletExceptionResponseTest.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 19 18:12:25 2011
@@ -1 +1 @@
-/camel/trunk:1148706,1148710,1149570,1150300-1150311,1150651,1151000,1151054,1151087,1151126,1151362,1152170,1152569,1152733,1152755,1152868,1153620,1153812,1153829,1154684,1155230,1155292,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1158230,1158295,1159171,1159174,1159326,1159457,1159460,1159596,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163231,1163420,1163656-1163669,1163725,1164343,1164544,1164557,1164633,1164972-1165000,1165152,1165157,1165658,1165971,1165987,1167098,1167131,1167448,1167487,1167555,1169610,1169620,1170122,1170226,1170397,1170956,1171396,1171755,1171941,1171947
+/camel/trunk:1148706,1148710,1149570,1150300-1150311,1150651,1151000,1151054,1151087,1151126,1151362,1152170,1152569,1152733,1152755,1152868,1153620,1153812,1153829,1154684,1155230,1155292,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1158230,1158295,1159171,1159174,1159326,1159457,1159460,1159596,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163231,1163420,1163656-1163669,1163725,1164342-1164343,1164544,1164557,1164633,1164972-1165000,1165152,1165157,1165658,1165971,1165987,1167098,1167131,1167448,1167487,1167555,1169610,1169620,1170122,1170226,1170397,1170956,1171396,1171755,1171941,1171947
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletOperationException.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletOperationException.java?rev=1172736&r1=1172735&r2=1172736&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletOperationException.java (original)
+++ camel/branches/camel-2.8.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletOperationException.java Mon Sep 19 18:12:25 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/branches/camel-2.8.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java?rev=1172736&r1=1172735&r2=1172736&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java (original)
+++ camel/branches/camel-2.8.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java Mon Sep 19 18:12:25 2011
@@ -171,7 +171,16 @@ public class RestletProducer extends Def
String uri = response.getRequest().getResourceRef().toString();
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/branches/camel-2.8.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletExceptionResponseTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletExceptionResponseTest.java?rev=1172736&r1=1172735&r2=1172736&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletExceptionResponseTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletExceptionResponseTest.java Mon Sep 19 18:12:25 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 {