gCubeSystem
/
gx-rest-legacy
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Fixed `getInputStream()` in a `GXInboundResponse` created from a connection, if is not a success response (HTTP code not in `2xx` and `3xx`)' (!1) from mauro.mugnaini/gx-rest:master into master 

Reviewed-on: gCubeSystem/gx-rest#1
Reviewed-by: Luca Frosini <luca.frosini@isti.cnr.it>
This commit is contained in:
Luca Frosini 2024-05-14 15:48:08 +02:00
parent 74cb5bdaa5 b3af1e29f8
commit eec32da4d7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gxJRS/src/main/java/org/gcube/common/gxrest/response/inbound/GXInboundResponse.java
View File

@ -104,7 +104,7 @@ public class GXInboundResponse {
// ContentUtils.toByteArray(connection.getInputStream());
if (this.contentType.equals(MediaType.TEXT_PLAIN)
|| this.contentType.equals(MediaType.APPLICATION_JSON)) {
this.body = ContentUtils.toString(ContentUtils.toByteArray(connection.getInputStream()));
this.body = ContentUtils.toString(ContentUtils.toByteArray(getInputStream()));
logger.trace("Response's content: " + this.body);
this.contentAlreadyConsumed = true;
}
@ -250,7 +250,7 @@ public class GXInboundResponse {
if(!this.contentAlreadyConsumed) {
if (this.fromConnection) {
contentAlreadyConsumed = true;
return connection.getInputStream();
return isSuccessResponse() ? connection.getInputStream() : connection.getErrorStream();
} else if (this.fromResponse) {
contentAlreadyConsumed = true;
return (InputStream) source.getEntity();