You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/04/10 15:37:58 UTC
svn commit: r1311719 - in /cxf/branches/2.5.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
Author: sergeyb
Date: Tue Apr 10 13:37:57 2012
New Revision: 1311719
URL: http://svn.apache.org/viewvc?rev=1311719&view=rev
Log:
Merged revisions 1311716 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1311716 | sergeyb | 2012-04-10 14:30:38 +0100 (Tue, 10 Apr 2012) | 1 line
Minor update to JAASAuthenticationFilter to convert SecurityException to 401
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1311716
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java?rev=1311719&r1=1311718&r2=1311719&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java Tue Apr 10 13:37:57 2012
@@ -86,10 +86,12 @@ public class JAASAuthenticationFilter im
return null;
} catch (AuthenticationException ex) {
return handleAuthenticationException(ex, m);
+ } catch (SecurityException ex) {
+ return handleAuthenticationException(ex, m);
}
}
- protected Response handleAuthenticationException(AuthenticationException ex, Message m) {
+ protected Response handleAuthenticationException(SecurityException ex, Message m) {
HttpHeaders headers = new HttpHeadersImpl(m);
if (redirectURI != null && isRedirectPossible(headers)) {