Skip to content

Commit

Permalink
ARROW-200: [C++/Python] Return error status on string initialization …
Browse files Browse the repository at this point in the history
…failure

Author: Micah Kornfield <emkornfield@gmail.com>

Closes #88 from emkornfield/emk_arrow_200 and squashes the following commits:

37e23be [Micah Kornfield] ARROW-200: Return error status on string initialization failure
  • Loading branch information
emkornfield authored and wesm committed Jun 8, 2016
1 parent 9ce13a0 commit bc6c4c8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions python/src/pyarrow/adapters/pandas.cc
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ class ArrowDeserializer {

out_values[i] = make_pystring(data, length);
if (out_values[i] == nullptr) {
return Status::OK();
return Status::UnknownError("String initialization failed");
}
}
}
Expand All @@ -678,7 +678,7 @@ class ArrowDeserializer {
data = string_arr->GetValue(i, &length);
out_values[i] = make_pystring(data, length);
if (out_values[i] == nullptr) {
return Status::OK();
return Status::UnknownError("String initialization failed");
}
}
}
Expand Down

0 comments on commit bc6c4c8

Please sign in to comment.