You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by cu...@apache.org on 2022/02/25 22:05:02 UTC
[arrow] branch master updated: ARROW-15272: [Java] Add cleanup failures as suppressed in ArrowVectorIterator#create
This is an automated email from the ASF dual-hosted git repository.
cutlerb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new fa78edc ARROW-15272: [Java] Add cleanup failures as suppressed in ArrowVectorIterator#create
fa78edc is described below
commit fa78edc8b08fa022e34db8b8fdeef4df41de703f
Author: Andrew Higgins <ah...@palantir.com>
AuthorDate: Fri Feb 25 14:02:04 2022 -0800
ARROW-15272: [Java] Add cleanup failures as suppressed in ArrowVectorIterator#create
Closes #12094 from ahggns/ah/arrow-15272
Authored-by: Andrew Higgins <ah...@palantir.com>
Signed-off-by: Bryan Cutler <cu...@gmail.com>
---
.../main/java/org/apache/arrow/adapter/jdbc/ArrowVectorIterator.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/ArrowVectorIterator.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/ArrowVectorIterator.java
index 768bd34..1dfc462 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/ArrowVectorIterator.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/ArrowVectorIterator.java
@@ -26,6 +26,7 @@ import java.util.Iterator;
import org.apache.arrow.adapter.jdbc.consumer.CompositeJdbcConsumer;
import org.apache.arrow.adapter.jdbc.consumer.JdbcConsumer;
+import org.apache.arrow.util.AutoCloseables;
import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.FieldVector;
import org.apache.arrow.vector.VectorSchemaRoot;
@@ -90,9 +91,7 @@ public class ArrowVectorIterator implements Iterator<VectorSchemaRoot>, AutoClos
iterator = new ArrowVectorIterator(resultSet, config);
iterator.initialize();
} catch (Throwable e) {
- if (iterator != null) {
- iterator.close();
- }
+ AutoCloseables.close(e, iterator);
throw new RuntimeException("Error occurred while creating iterator.", e);
}
return iterator;