Check for null values

innoveit · Jul 24, 2018 · 7ab17fb · 7ab17fb
1 parent 822894f
commit 7ab17fb
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/android/src/main/java/it/innove/Peripheral.java b/android/src/main/java/it/innove/Peripheral.java
@@ -176,7 +176,9 @@ public WritableMap asWritableMap() {
 				WritableMap serviceData = Arguments.createMap();
 				if (advertisingData.getServiceData() != null) {
 					for (Map.Entry<ParcelUuid, byte[]> entry : advertisingData.getServiceData().entrySet()) {
-						serviceData.putMap(UUIDHelper.uuidToString(((ParcelUuid) entry.getKey()).getUuid()), byteArrayToWritableMap((byte[]) entry.getValue()));
+						if (entry.getValue() != null) {
+							serviceData.putMap(UUIDHelper.uuidToString((entry.getKey()).getUuid()), byteArrayToWritableMap(entry.getValue()));
+						}
 					}
 				}