DATAMONGO-1617 - Reinstantiate version property initialization before BeforeConvertEvent publication.

Related pull request: #443.

Author: odrotbohm

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java

@@ -750,7 +750,7 @@ public long count(final Query query, String collectionName) {
 	public long count(Query query, Class<?> entityClass, String collectionName) {
 
 		Assert.hasText(collectionName, "Collection name must not be null or empty!");
-		
+
 		final DBObject dbObject = query == null ? null
 				: queryMapper.getMappedObject(query.getQueryObject(),
 						entityClass == null ? null : mappingContext.getPersistentEntity(entityClass));
@@ -829,11 +829,10 @@ private WriteConcern potentiallyForceAcknowledgedWrite(WriteConcern wc) {
 
 	protected <T> void doInsert(String collectionName, T objectToSave, MongoWriter<T> writer) {
 
+		initializeVersionProperty(objectToSave);
 		maybeEmitEvent(new BeforeConvertEvent<T>(objectToSave, collectionName));
 		assertUpdateableIdIfNotSet(objectToSave);
 
-		initializeVersionProperty(objectToSave);
-
 		DBObject dbDoc = toDbObject(objectToSave, writer);
 
 		maybeEmitEvent(new BeforeSaveEvent<T>(objectToSave, dbDoc, collectionName));
@@ -923,12 +922,13 @@ protected <T> void doInsertBatch(String collectionName, Collection<? extends T>
 		Assert.notNull(writer, "MongoWriter must not be null!");
 
 		List<DBObject> dbObjectList = new ArrayList<DBObject>();
+
 		for (T o : batchToSave) {
 
 			initializeVersionProperty(o);
-			BasicDBObject dbDoc = new BasicDBObject();
-
 			maybeEmitEvent(new BeforeConvertEvent<T>(o, collectionName));
+
+			BasicDBObject dbDoc = new BasicDBObject();
 			writer.write(o, dbDoc);
 
 			maybeEmitEvent(new BeforeSaveEvent<T>(o, dbDoc, collectionName));