refetch entity after content modification operations when entity is @…

…versioned

spring-content-rest/src/main/java/internal/org/springframework/content/rest/controllers/ContentEntityRestController.java

@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.persistence.Version;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -178,6 +179,11 @@ public void putContent(HttpServletRequest request, HttpServletResponse response,
 
 		info.getImpementation().setContent(domainObj, request.getInputStream());
 
+		// re-fetch to make sure we have the latest
+		if (BeanUtils.hasFieldWithAnnotation(domainObj, Version.class)) {
+			domainObj = findOne(repositories, info.getDomainObjectClass(), id);
+		}
+
 		save(repositories, domainObj);
 
 		if (isNew) {
@@ -232,6 +238,11 @@ public void deleteContent(HttpServletResponse response, @PathVariable String sto
 
 		info.getImpementation().unsetContent(domainObj);
 
+		// re-fetch to make sure we have the latest
+		if (BeanUtils.hasFieldWithAnnotation(domainObj, Version.class)) {
+			domainObj = findOne(repositories, info.getDomainObjectClass(), id);
+		}
+
 		if (BeanUtils.hasFieldWithAnnotation(domainObj, MimeType.class)) {
 			BeanUtils.setFieldWithAnnotation(domainObj, MimeType.class, null);
 		}