From 1a7adc64612b9ae78a0698f3addf4e680a3c7b59 Mon Sep 17 00:00:00 2001
From: Jon Brisbin <jbrisbin@vmware.com>
Date: Wed, 6 Mar 2013 10:34:24 -0600
Subject: [PATCH] Tweaks to ValidationExceptionHandler injection.

---
 .../data/rest/webmvc/AbstractRepositoryRestController.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/AbstractRepositoryRestController.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/AbstractRepositoryRestController.java
index d9e422844..53ed99ab0 100644
--- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/AbstractRepositoryRestController.java
+++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/AbstractRepositoryRestController.java
@@ -64,6 +64,8 @@ public class AbstractRepositoryRestController implements ApplicationContextAware
 	protected final MethodParameterConversionService methodParameterConversionService;
 	protected final EntityLinks                      entityLinks;
 	protected       ApplicationContext               applicationContext;
+	@Autowired(required = false)
+	protected       ValidationExceptionHandler       handler;
 
 	@Autowired
 	public AbstractRepositoryRestController(Repositories repositories,
@@ -141,7 +143,6 @@ public class AbstractRepositoryRestController implements ApplicationContextAware
 	@ResponseBody
 	public ResponseEntity maybeHandleValidationException(Locale locale,
 	                                                     RuntimeException ex) {
-		ValidationExceptionHandler handler = applicationContext.getBean(ValidationExceptionHandler.class);
 		if(null != handler) {
 			return handler.handleValidationException(ex,
 			                                         applicationContext,