From 9ce68df7d7740bfe54d7f4b0850a9d3f8aa898b6 Mon Sep 17 00:00:00 2001
From: Alex Ott <alex.ott@datastax.com>
Date: Thu, 15 Nov 2018 15:07:03 +0100
Subject: [PATCH] small optimization - lookup enum value only once

---
 .../src/main/java/com/datastax/driver/mapping/Mapper.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/driver-mapping/src/main/java/com/datastax/driver/mapping/Mapper.java b/driver-mapping/src/main/java/com/datastax/driver/mapping/Mapper.java
index 1e13f25d02b..c6792634dfd 100644
--- a/driver-mapping/src/main/java/com/datastax/driver/mapping/Mapper.java
+++ b/driver-mapping/src/main/java/com/datastax/driver/mapping/Mapper.java
@@ -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);