You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2012/10/01 07:09:58 UTC
svn commit: r1392211 -
/tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java
Author: rfeng
Date: Mon Oct 1 05:09:58 2012
New Revision: 1392211
URL: http://svn.apache.org/viewvc?rev=1392211&view=rev
Log:
Fix the entity consumption
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java
Modified: tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java?rev=1392211&r1=1392210&r2=1392211&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java Mon Oct 1 05:09:58 2012
@@ -55,7 +55,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.UriBuilder;
import org.apache.http.client.HttpClient;
-import org.apache.http.entity.StringEntity;
+import org.apache.http.entity.ByteArrayEntity;
import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.assembly.WireFormat;
import org.apache.tuscany.sca.binding.rest.RESTBinding;
@@ -284,14 +284,9 @@ public class RESTBindingInvoker implemen
} catch (ClientWebException e) {
ClientResponse clientResponse = e.getResponse();
// Consume the entity
- String error = clientResponse.getEntity(String.class);
- StringEntity stringEntity;
- try {
- stringEntity = error == null ? null : new StringEntity(error);
- clientResponse.setEntity(stringEntity);
- } catch (UnsupportedEncodingException e1) {
- // Ignore
- }
+ byte[] error = clientResponse.getEntity(byte[].class);
+ ByteArrayEntity errorEntity = error == null ? null : new ByteArrayEntity(error);
+ clientResponse.setEntity(errorEntity);
throw e;
}
return msg;