Browse Source

SEC-1136: Converted base exceptions to extend RuntimeException rather than NestedRuntimeException.

Luke Taylor 16 years ago
parent
commit
292926518b

+ 3 - 5
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 ===================================================================================================
 
     /**

+ 1 - 4
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;

+ 3 - 3
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);