From a0b0e4cdd686a5b66cea155d35e113165f717488 Mon Sep 17 00:00:00 2001
From: mchuangatmp <mchuang@mparticle.com>
Date: Fri, 20 May 2022 10:09:09 -0700
Subject: [PATCH] fix: change default batch creation error logic

---
 .../kotlin/com.mparticle/BatchCreationCallbackTests.kt      | 6 ++----
 .../internal/database/services/MParticleDBManager.java      | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/android-core/src/androidTest/kotlin/com.mparticle/BatchCreationCallbackTests.kt b/android-core/src/androidTest/kotlin/com.mparticle/BatchCreationCallbackTests.kt
index cfd7aaabb..d7df37b45 100644
--- a/android-core/src/androidTest/kotlin/com.mparticle/BatchCreationCallbackTests.kt
+++ b/android-core/src/androidTest/kotlin/com.mparticle/BatchCreationCallbackTests.kt
@@ -113,9 +113,7 @@ class BatchCreationCallbackTests : BaseCleanInstallEachTest() {
 
     @Test
     fun testListenerCrashes() {
-        var newBatch = JSONObject().put("the whole", "batch")
-        val targetEventName = "should not send"
-
+        val targetEventName = "should send"
         val options = MParticleOptions.builder(mContext)
             .batchCreationListener {
                 it.optJSONArray("msgs")
@@ -158,7 +156,7 @@ class BatchCreationCallbackTests : BaseCleanInstallEachTest() {
                 ?.filterIsInstance<JSONObject>()
                 ?.any { it.optString("n") == targetEventName } ?: false
         }.let {
-            assertFalse { it }
+            assertTrue { it }
         }
     }
 
diff --git a/android-core/src/main/java/com/mparticle/internal/database/services/MParticleDBManager.java b/android-core/src/main/java/com/mparticle/internal/database/services/MParticleDBManager.java
index ec0a5ba27..eebe22f7f 100644
--- a/android-core/src/main/java/com/mparticle/internal/database/services/MParticleDBManager.java
+++ b/android-core/src/main/java/com/mparticle/internal/database/services/MParticleDBManager.java
@@ -321,8 +321,7 @@ private void createUploads(Map<BatchId, MessageBatch> uploadMessagesByBatchId, M
                             batch.put(Constants.MessageKey.MODIFIED_BATCH, true);
                         }
                     } catch (Exception e) {
-                        Logger.error(e, "batch creation listener error, batch will not be uploaded");
-                        return;
+                        Logger.error(e, "batch creation listener error, original batch will be uploaded");
                     }
                 }