Skip to content

Commit c52adc2

Browse files
committed
Fix ARROW_STRUCT_CONFLICT_POLICY env not work
1 parent ec3a424 commit c52adc2

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

vector/src/main/java/org/apache/arrow/vector/complex/AbstractStructVector.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,13 @@ public abstract class AbstractStructVector extends AbstractContainerVector {
4646
private ConflictPolicy conflictPolicy;
4747

4848
static {
49-
String conflictPolicyStr =
50-
System.getProperty(STRUCT_CONFLICT_POLICY_JVM, ConflictPolicy.CONFLICT_REPLACE.toString());
49+
String conflictPolicyStr = System.getProperty(STRUCT_CONFLICT_POLICY_JVM);
5150
if (conflictPolicyStr == null) {
5251
conflictPolicyStr = System.getenv(STRUCT_CONFLICT_POLICY_ENV);
5352
}
53+
if (conflictPolicyStr == null) {
54+
conflictPolicyStr = ConflictPolicy.CONFLICT_REPLACE.toString();
55+
}
5456
ConflictPolicy conflictPolicy;
5557
try {
5658
conflictPolicy = ConflictPolicy.valueOf(conflictPolicyStr.toUpperCase(Locale.ROOT));

0 commit comments

Comments
 (0)