garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

prevent NPE on jboss

Browse Source
This commit is contained in:
Jeremie Panzer
2013-03-27 16:15:34 +01:00
parent 3806f18128
commit 3b33d7588b
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/commafeed/frontend/rest/JSONMessageBodyReaderWriter.java
View File

@@ -68,14 +68,7 @@ public class JSONMessageBodyReaderWriter implements MessageBodyWriter<Object>,
httpHeaders.putSingle(HttpHeaders.CONTENT_TYPE, mediaType.toString()
+ ";charset=UTF-8");
OutputStreamWriter writer = new OutputStreamWriter(entityStream, UTF_8);
Type jsonType;
if (type.equals(genericType)) {
jsonType = type;
} else {
jsonType = genericType;
}
getGson().toJson(t, jsonType, writer);
getGson().toJson(t, type, writer);
writer.flush();
}
@@ -86,13 +79,7 @@ public class JSONMessageBodyReaderWriter implements MessageBodyWriter<Object>,
throws IOException, WebApplicationException {
InputStreamReader reader = new InputStreamReader(
new BufferedInputStream(entityStream), UTF_8);
Type jsonType;
if (type.equals(genericType)) {
jsonType = type;
} else {
jsonType = genericType;
}
return getGson().fromJson(reader, jsonType);
return getGson().fromJson(reader, type);
}
private Gson getGson() {