From 3b33d7588b92d8ef8a7688601ebb01bf1f4607c2 Mon Sep 17 00:00:00 2001 From: Jeremie Panzer Date: Wed, 27 Mar 2013 16:15:34 +0100 Subject: [PATCH] prevent NPE on jboss --- .../rest/JSONMessageBodyReaderWriter.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/commafeed/frontend/rest/JSONMessageBodyReaderWriter.java b/src/main/java/com/commafeed/frontend/rest/JSONMessageBodyReaderWriter.java index 502f0b3c..64619a16 100644 --- a/src/main/java/com/commafeed/frontend/rest/JSONMessageBodyReaderWriter.java +++ b/src/main/java/com/commafeed/frontend/rest/JSONMessageBodyReaderWriter.java @@ -68,14 +68,7 @@ public class JSONMessageBodyReaderWriter implements MessageBodyWriter, 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, 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() {