File tree Expand file tree Collapse file tree 1 file changed +4
-2
lines changed
vector/src/main/java/org/apache/arrow/vector/complex Expand file tree Collapse file tree 1 file changed +4
-2
lines changed Original file line number Diff line number Diff 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 ));
You can’t perform that action at this time.
0 commit comments