Handle errors at a higher level.

When an error happens inside the AbstractMappingContext, the caching sometimes gets corrupted. That's because some exceptions are caught, others are not. Instead, the error handling that clears out the cache needs to be shifted up one level, resulting in a simpler code block.

See #2329.

Author: gregturn

src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java

@@ -108,7 +108,8 @@ protected AbstractMappingContext() {
 		this.persistentPropertyPathFactory = new PersistentPropertyPathFactory<>(this);
 
 		EntityInstantiators instantiators = new EntityInstantiators();
-		PersistentPropertyAccessorFactory accessorFactory = NativeDetector.inNativeImage() ? BeanWrapperPropertyAccessorFactory.INSTANCE
+		PersistentPropertyAccessorFactory accessorFactory = NativeDetector.inNativeImage()
+				? BeanWrapperPropertyAccessorFactory.INSTANCE
 				: new ClassGeneratingPropertyAccessorFactory();
 
 		this.persistentPropertyAccessorFactory = new InstantiationAwarePropertyAccessorFactory(accessorFactory,
@@ -378,25 +379,21 @@ protected Optional<E> addPersistentEntity(TypeInformation<?> typeInformation) {
 				descriptors.put(descriptor.getName(), descriptor);
 			}
 
-			try {
-
-				PersistentPropertyCreator persistentPropertyCreator = new PersistentPropertyCreator(entity, descriptors);
-				ReflectionUtils.doWithFields(type, persistentPropertyCreator, PersistentPropertyFilter.INSTANCE);
-				persistentPropertyCreator.addPropertiesForRemainingDescriptors();
+			PersistentPropertyCreator persistentPropertyCreator = new PersistentPropertyCreator(entity, descriptors);
+			ReflectionUtils.doWithFields(type, persistentPropertyCreator, PersistentPropertyFilter.INSTANCE);
+			persistentPropertyCreator.addPropertiesForRemainingDescriptors();
 
-				entity.verify();
-
-				if (persistentPropertyAccessorFactory.isSupported(entity)) {
-					entity.setPersistentPropertyAccessorFactory(persistentPropertyAccessorFactory);
-				}
+			entity.verify();
 
-			} catch (RuntimeException e) {
-				persistentEntities.remove(typeInformation);
-				throw e;
+			if (persistentPropertyAccessorFactory.isSupported(entity)) {
+				entity.setPersistentPropertyAccessorFactory(persistentPropertyAccessorFactory);
 			}
 
 		} catch (BeansException e) {
 			throw new MappingException(e.getMessage(), e);
+		} catch (RuntimeException e) {
+			persistentEntities.remove(typeInformation);
+			throw e;
 		} finally {
 			write.unlock();
 		}