Skip to content

Code clear and bug fix #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcuslinke merged 3 commits into from
Sep 19, 2014
Merged

Code clear and bug fix #58

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e6bfdc
Remove unused code
Sep 19, 2014
833dc2f
Clear code style
Sep 19, 2014
04c528e
Fixed ResponseStatusExceptionFilter.getBodyAsMessage() incorrect read…
Sep 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fixed ResponseStatusExceptionFilter.getBodyAsMessage() incorrect read… 
…ing entity
  • Loading branch information
yuxuanchi committed Sep 19, 2014
commit 04c528eed90317f7db29f6964f2b176e1e8ea07c
38 changes: 34 additions & 4 deletions src/main/java/com/github/dockerjava/jaxrs/util/ResponseStatusExceptionFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package com.github.dockerjava.jaxrs.util;

import java.io.EOFException;
import java.io.IOException;
import java.nio.charset.Charset;

import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientResponseContext;
import javax.ws.rs.client.ClientResponseFilter;
import javax.ws.rs.core.MediaType;

import org.apache.commons.io.IOUtils;

Expand Down Expand Up @@ -55,9 +58,36 @@ public void filter(ClientRequestContext requestContext, ClientResponseContext re

public String getBodyAsMessage(ClientResponseContext responseContext)
throws IOException {
byte[] buffer = new byte[1000];
IOUtils.read(responseContext.getEntityStream(), buffer);
String message = new String(buffer);
return message;
if (responseContext.hasEntity()) {
int contentLength = responseContext.getLength();
if (contentLength != -1) {
byte[] buffer = new byte[contentLength];
try {
IOUtils.readFully(responseContext.getEntityStream(), buffer);
}
catch (EOFException e) {
return null;
}
Charset charset = null;
MediaType mediaType = responseContext.getMediaType();
if (mediaType != null) {
String charsetName = mediaType.getParameters().get("charset");
if (charsetName != null) {
try {
charset = Charset.forName(charsetName);
}
catch (Exception e) {
//Do noting...
}
}
}
if (charset == null) {
charset = Charset.defaultCharset();
}
String message = new String(buffer, charset);
return message;
}
}
return null;
}
}