Skip to content

Commit deeb141

Browse files
iruizmakarnokd
authored andcommitted
Change error message in ObservableFromArray (ReactiveX#6461)
* Change error message in ObservableFromArray Changed error message from "The $i th element is null" to "The element at index $i is null". Solves ReactiveX#6460 * Change error messages in FlowableFromArray Changed error messages from "array element is null" to "The element at index $i is null". Solves ReactiveX#6460
1 parent c04cfb8 commit deeb141

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/main/java/io/reactivex/internal/operators/flowable/FlowableFromArray.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ void fastPath() {
126126
}
127127
T t = arr[i];
128128
if (t == null) {
129-
a.onError(new NullPointerException("array element is null"));
129+
a.onError(new NullPointerException("The element at index " + i + " is null"));
130130
return;
131131
} else {
132132
a.onNext(t);
@@ -156,7 +156,7 @@ void slowPath(long r) {
156156
T t = arr[i];
157157

158158
if (t == null) {
159-
a.onError(new NullPointerException("array element is null"));
159+
a.onError(new NullPointerException("The element at index " + i + " is null"));
160160
return;
161161
} else {
162162
a.onNext(t);
@@ -209,7 +209,7 @@ void fastPath() {
209209
}
210210
T t = arr[i];
211211
if (t == null) {
212-
a.onError(new NullPointerException("array element is null"));
212+
a.onError(new NullPointerException("The element at index " + i + " is null"));
213213
return;
214214
} else {
215215
a.tryOnNext(t);
@@ -239,7 +239,7 @@ void slowPath(long r) {
239239
T t = arr[i];
240240

241241
if (t == null) {
242-
a.onError(new NullPointerException("array element is null"));
242+
a.onError(new NullPointerException("The element at index " + i + " is null"));
243243
return;
244244
} else {
245245
if (a.tryOnNext(t)) {

src/main/java/io/reactivex/internal/operators/observable/ObservableFromArray.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ void run() {
102102
for (int i = 0; i < n && !isDisposed(); i++) {
103103
T value = a[i];
104104
if (value == null) {
105-
downstream.onError(new NullPointerException("The " + i + "th element is null"));
105+
downstream.onError(new NullPointerException("The element at index " + i + " is null"));
106106
return;
107107
}
108108
downstream.onNext(value);

0 commit comments

Comments
 (0)