Johannes/gson-comments
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a regression that expects different type adapters for long.class and Long.class. This is a temporary fix; later we may want to always use the canonical wrapped class.

Browse Source
This commit is contained in:
Jesse Wilson 2010-11-01 22:46:20 +00:00
parent 20d895ff95
commit c8c3a6965c
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gson/src/main/java/com/google/gson/Gson.java
View File

@ -392,9 +392,8 @@ public final class Gson {
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <T> T fromJson(String json, Class<T> classOfT) throws JsonParseException { public <T> T fromJson(String json, Class<T> classOfT) throws JsonParseException {
Class<T> wrapped = Primitives.wrap(classOfT); Object object = fromJson(json, (Type) classOfT);
Object object = fromJson(json, (Type) wrapped); return Primitives.wrap(classOfT).cast(object);
return wrapped.cast(object);
} }
/** /**
@ -443,9 +442,8 @@ public final class Gson {
* @since 1.2 * @since 1.2
*/ */
public <T> T fromJson(Reader json, Class<T> classOfT) throws JsonParseException { public <T> T fromJson(Reader json, Class<T> classOfT) throws JsonParseException {
Class<T> wrapped = Primitives.wrap(classOfT); Object object = fromJson(new JsonReader(json), classOfT);
Object object = fromJson(new JsonReader(json), wrapped); return Primitives.wrap(classOfT).cast(object);
return wrapped.cast(object);
} }
/** /**
@ -503,9 +501,8 @@ public final class Gson {
* @since 1.3 * @since 1.3
*/ */
public <T> T fromJson(JsonElement json, Class<T> classOfT) throws JsonParseException { public <T> T fromJson(JsonElement json, Class<T> classOfT) throws JsonParseException {
Class<T> wrapped = Primitives.wrap(classOfT); Object object = fromJson(json, (Type) classOfT);
Object object = fromJson(json, (Type) wrapped); return Primitives.wrap(classOfT).cast(object);
return wrapped.cast(object);
} }
/** /**