Skip to content

Commit 8b63096

Browse files
Fix error thrown
1 parent 1536e42 commit 8b63096

File tree

3 files changed

+8
-8
lines changed
  • firebase-database/src
    • androidMain/kotlin/dev/gitlive/firebase/database
    • iosMain/kotlin/dev/gitlive/firebase/database
    • jsMain/kotlin/dev/gitlive/firebase/database

3 files changed

+8
-8
lines changed

firebase-database/src/androidMain/kotlin/dev/gitlive/firebase/database/database.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -202,10 +202,10 @@ actual class DatabaseReference internal constructor(
202202
committed: Boolean,
203203
snapshot: com.google.firebase.database.DataSnapshot?
204204
) {
205-
if (error == null && snapshot != null) {
206-
deferred.complete(Result.success(DataSnapshot(snapshot)))
205+
if(error != null) {
206+
throw error.toException()
207207
} else {
208-
deferred.complete(Result.failure(Throwable(error?.message)))
208+
deferred.complete(Result.success(DataSnapshot(snapshot!!)))
209209
}
210210
}
211211

firebase-database/src/iosMain/kotlin/dev/gitlive/firebase/database/database.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,10 @@ actual class DatabaseReference internal constructor(
165165
FIRTransactionResult.successWithValue(transactionUpdate(decode(strategy, firMutableData)) as FIRMutableData)
166166
},
167167
andCompletionBlock = { error, _, snapshot ->
168-
if (error == null) {
169-
deferred.complete(Result.success(DataSnapshot(snapshot!!)))
168+
if (error != null) {
169+
throw error
170170
} else {
171-
deferred.complete(Result.failure(Throwable(error.localizedDescription)))
171+
deferred.complete(Result.success(DataSnapshot(snapshot!!)))
172172
}
173173
},
174174
withLocalEvents = false

firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/database.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ actual class DatabaseReference internal constructor(override val js: firebase.da
135135
transactionUpdate,
136136
{ error, _, snapshot ->
137137
if (error != null) {
138-
deferred.complete(Result.success(DataSnapshot(snapshot!!)))
138+
throw error
139139
} else {
140-
deferred.complete(Result.failure(Throwable(error?.message)))
140+
deferred.complete(Result.success(DataSnapshot(snapshot!!)))
141141
}
142142
},
143143
applyLocally = false

0 commit comments

Comments
 (0)