From 292926518b47b05390221c2117fb32dc44acd1c2 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Wed, 15 Apr 2009 10:19:37 +0000
Subject: [PATCH] SEC-1136: Converted base exceptions to extend
 RuntimeException rather than NestedRuntimeException.

---
 .../security/access/AccessDeniedException.java            | 8 +++-----
 .../security/core/AuthenticationException.java            | 5 +----
 .../security/web/ExceptionTranslationFilter.java          | 6 +++---
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/org/springframework/security/access/AccessDeniedException.java b/core/src/main/java/org/springframework/security/access/AccessDeniedException.java
index dd63585c4c..f7acb1c15a 100644
--- a/core/src/main/java/org/springframework/security/access/AccessDeniedException.java
+++ b/core/src/main/java/org/springframework/security/access/AccessDeniedException.java
@@ -15,16 +15,14 @@
 
 package org.springframework.security.access;
 
-import org.springframework.core.NestedRuntimeException;
-import org.springframework.security.core.Authentication;
-
 /**
- * Thrown if an {@link Authentication} object does not hold a required authority.
+ * Thrown if an {@link org.springframework.security.core.Authentication Authentication} object does not hold a
+ * required authority.
  *
  * @author Ben Alex
  * @version $Id$
  */
-public class AccessDeniedException extends NestedRuntimeException {
+public class AccessDeniedException extends RuntimeException {
     //~ Constructors ===================================================================================================
 
     /**
diff --git a/core/src/main/java/org/springframework/security/core/AuthenticationException.java b/core/src/main/java/org/springframework/security/core/AuthenticationException.java
index 18e1fe00b9..5b600616d3 100644
--- a/core/src/main/java/org/springframework/security/core/AuthenticationException.java
+++ b/core/src/main/java/org/springframework/security/core/AuthenticationException.java
@@ -15,9 +15,6 @@
 
 package org.springframework.security.core;
 
-import org.springframework.core.NestedRuntimeException;
-
-
 /**
  * Abstract superclass for all exceptions related to an {@link Authentication} object being invalid for whatever
  * reason.
@@ -25,7 +22,7 @@ import org.springframework.core.NestedRuntimeException;
  * @author Ben Alex
  * @version $Id$
  */
-public abstract class AuthenticationException extends NestedRuntimeException {
+public abstract class AuthenticationException extends RuntimeException {
     //~ Instance fields ================================================================================================
 
     private Authentication authentication;
diff --git a/web/src/main/java/org/springframework/security/web/ExceptionTranslationFilter.java b/web/src/main/java/org/springframework/security/web/ExceptionTranslationFilter.java
index 61dea28049..91d2cfdaf9 100644
--- a/web/src/main/java/org/springframework/security/web/ExceptionTranslationFilter.java
+++ b/web/src/main/java/org/springframework/security/web/ExceptionTranslationFilter.java
@@ -102,11 +102,11 @@ public class ExceptionTranslationFilter extends SpringSecurityFilter implements
         catch (Exception ex) {
             // Try to extract a SpringSecurityException from the stacktrace
             Throwable[] causeChain = throwableAnalyzer.determineCauseChain(ex);
-            NestedRuntimeException ase = (NestedRuntimeException)
+            RuntimeException ase = (AuthenticationException)
                     throwableAnalyzer.getFirstThrowableOfType(AuthenticationException.class, causeChain);
 
             if (ase == null) {
-                ase = (NestedRuntimeException)throwableAnalyzer.getFirstThrowableOfType(AccessDeniedException.class, causeChain);
+                ase = (AccessDeniedException)throwableAnalyzer.getFirstThrowableOfType(AccessDeniedException.class, causeChain);
             }
 
             if (ase != null) {
@@ -139,7 +139,7 @@ public class ExceptionTranslationFilter extends SpringSecurityFilter implements
     }
 
     private void handleException(HttpServletRequest request, HttpServletResponse response, FilterChain chain,
-            NestedRuntimeException exception) throws IOException, ServletException {
+            RuntimeException exception) throws IOException, ServletException {
         if (exception instanceof AuthenticationException) {
             if (logger.isDebugEnabled()) {
                 logger.debug("Authentication exception occurred; redirecting to authentication entry point", exception);