Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,9 @@ private ListenableFuture<BoundStatement> saveQueryAsync(
T entity, final EnumMap<Option.Type, Option> options) {
final Map<AliasedMappedProperty, Object> columnToValue =
new TreeMap<AliasedMappedProperty, Object>();
final boolean useUnsetForNullValue =
!shouldSaveNullFields(options) && manager.protocolVersionAsInt >= 4;
final boolean includeColumnsWithNullValue =
shouldSaveNullFields(options) || useUnsetForNullValue;
final boolean shouldSaveNullFields = shouldSaveNullFields(options);
final boolean useUnsetForNullValue = !shouldSaveNullFields && manager.protocolVersionAsInt >= 4;
final boolean includeColumnsWithNullValue = shouldSaveNullFields || useUnsetForNullValue;

for (AliasedMappedProperty col : mapper.allColumns) {
Object value = col.mappedProperty.getValue(entity);
Expand Down