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

Support reading nulls into strings

Browse Source
This commit is contained in:
Jesse Wilson 2011-09-09 03:40:39 +00:00
parent 6029afb72d
commit 4f6a36d68f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gson/src/main/java/com/google/gson/internal/bind/TypeAdapters.java
View File

@ -16,6 +16,10 @@
package com.google.gson.internal.bind; package com.google.gson.internal.bind;
import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
@ -24,10 +28,6 @@ import java.util.Locale;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.UUID; import java.util.UUID;
import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
/** /**
* Type adapters for basic types. * Type adapters for basic types.
*/ */
@ -108,6 +108,10 @@ public final class TypeAdapters {
public static final TypeAdapter<String> STRING = new TypeAdapter<String>() { public static final TypeAdapter<String> STRING = new TypeAdapter<String>() {
public String read(JsonReader reader) throws IOException { public String read(JsonReader reader) throws IOException {
if (reader.peek() == JsonToken.NULL) {
reader.nextNull(); // TODO: does this belong here?
return null;
}
return reader.nextString(); return reader.nextString();
} }
public void write(JsonWriter writer, String value) throws IOException { public void write(JsonWriter writer, String value) throws IOException {