Fix oversight in my base message deserialisation code, covering the c…

…ase where a key is populated but with JSON null.
ably · Jun 12, 2020 · 5101238 · 5101238
1 parent 7fbc7b1
commit 5101238
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/src/main/java/io/ably/lib/types/BaseMessage.java b/lib/src/main/java/io/ably/lib/types/BaseMessage.java
@@ -3,6 +3,7 @@
 import com.davidehrmann.vcdiff.VCDiffDecoder;
 import com.davidehrmann.vcdiff.VCDiffDecoderBuilder;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonPrimitive;
@@ -241,7 +242,7 @@ protected void read(final JsonObject map) throws MessageDecodeException {
 	 */
 	protected String readString(final JsonObject map, final String key) {
 		final JsonElement element = map.get(key);
-		if (null == element) {
+		if (null == element || element instanceof JsonNull) {
 			return null;
 		}
 		return element.getAsString();
@@ -255,7 +256,7 @@ protected String readString(final JsonObject map, final String key) {
 	 */
 	protected Long readLong(final JsonObject map, final String key) {
 		final JsonElement element = map.get(key);
-		if (null == element) {
+		if (null == element || element instanceof JsonNull) {
 			return null;
 		}
 		return element.getAsLong();