[utilities COMMIT] /spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/error/ExtendedMappingExceptionRes...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jun  9 22:40:04 2014
New Revision: 596

URL: http://svn.shibboleth.net/view/utilities?rev=596&view=rev
Log:
Populate exception view with Spring context.

Modified:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/error/ExtendedMappingExceptionResolver.java

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/error/ExtendedMappingExceptionResolver.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/error/ExtendedMappingExceptionResolver.java?rev=596&r1=595&r2=596&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/error/ExtendedMappingExceptionResolver.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/error/ExtendedMappingExceptionResolver.java Mon Jun  9 22:40:04 2014
@@ -26,6 +26,8 @@
 import net.shibboleth.utilities.java.support.codec.HTMLEncoder;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
 
@@ -42,7 +44,10 @@
 
     /** Model attribute carrying {@link HttpServletRequest}. */
     @Nonnull private static final String MODEL_ATTR_REQUEST = "request";
-    
+
+    /** Model attribute carrying {@link WebApplicationContext}. */
+    @Nonnull private static final String MODEL_ATTR_SPRINGCONTEXT = "springContext";
+
     /** Model attribute carrying the {@link HTMLEncoder} class. */
     @Nonnull private static final String MODEL_ATTR_ENCODER = "encoder";
     
@@ -71,6 +76,12 @@
         view.addObject(MODEL_ATTR_REQUEST, request);
         view.addObject(MODEL_ATTR_ENCODER, HTMLEncoder.class);
         
+        final WebApplicationContext context =
+                WebApplicationContextUtils.getRequiredWebApplicationContext(request.getServletContext());
+        if (context != null) {
+            view.addObject(MODEL_ATTR_SPRINGCONTEXT, context);
+        }
+        
         if (viewModelExtenderFunction != null) {
             final Map<String,Object> exts = viewModelExtenderFunction.apply(request);
             if (exts != null) {