From 9c7fed6be5cc5a9e122b49bd5b54e480001227e5 Mon Sep 17 00:00:00 2001
From: Ivan Vasylyev <vasilievip@gmail.com>
Date: Mon, 13 Jul 2015 17:11:30 +0300
Subject: [PATCH] DATACOUCH-151 - Fixed NullPointerException on auto-boxing in
 CouchbaseTemplate.

Original pull request: #55.
---
 .../springframework/data/couchbase/core/CouchbaseTemplate.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java
index b91594d3..68958596 100644
--- a/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java
+++ b/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java
@@ -314,7 +314,8 @@ public class CouchbaseTemplate implements CouchbaseOperations, ApplicationEventP
           if (cas == CASResponse.EXISTS) {
             throw new OptimisticLockingFailureException("Saving document with version value failed: " + cas);
           } else {
-            long newCas = casFuture.getCas();
+            Long casValue = casFuture.getCas();
+            long newCas = (casValue == null) ? 0 : casValue.longValue();
             beanWrapper.setProperty(versionProperty, newCas);
             return true;
           }