Author: reto
Date: Fri Oct 5 22:51:21 2012
New Revision: 1394854
URL: http://svn.apache.org/viewvc?rev=1394854&view=rev
Log:
ignoring .settings
Modified:
stanbol/trunk/commons/security/core/ (props changed)
stanbol/trunk/commons/security/core/src/main/java/org/apache/stanbol/commons/security/auth/AuthenticatingFilter.java
Propchange: stanbol/trunk/commons/security/core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Oct 5 22:51:21 2012
@@ -1,3 +1,4 @@
+.settings
target
.classpath
.project
Modified:
stanbol/trunk/commons/security/core/src/main/java/org/apache/stanbol/commons/security/auth/AuthenticatingFilter.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/core/src/main/java/org/apache/stanbol/commons/security/auth/AuthenticatingFilter.java?rev=1394854&r1=1394853&r2=1394854&view=diff
==============================================================================
---
stanbol/trunk/commons/security/core/src/main/java/org/apache/stanbol/commons/security/auth/AuthenticatingFilter.java
(original)
+++
stanbol/trunk/commons/security/core/src/main/java/org/apache/stanbol/commons/security/auth/AuthenticatingFilter.java
Fri Oct 5 22:51:21 2012
@@ -130,19 +130,21 @@ public class AuthenticatingFilter implem
final HttpServletRequest request = (HttpServletRequest)
servletRequest;
final HttpServletResponse response = (HttpServletResponse)
servletResponse;
final Subject subject = getSubject();
- AuthenticationMethod authenticationMethod = null;
- try {
- for (Iterator<WeightedAuthenticationMethod> it =
methodList.iterator(); it.hasNext();) {
- authenticationMethod = it.next();
- if
(authenticationMethod.authenticate(request,subject)) {
- break;
+ {
+ AuthenticationMethod authenticationMethod = null;
+ try {
+ for (Iterator<WeightedAuthenticationMethod> it
= methodList.iterator(); it.hasNext();) {
+ authenticationMethod = it.next();
+ if
(authenticationMethod.authenticate(request,subject)) {
+ break;
+ }
}
+ } catch (LoginException ex) {
+ if
(!authenticationMethod.writeLoginResponse(request, response, ex)) {
+ writeLoginResponse(request, response,
ex);
+ }
+ return;
}
- } catch (LoginException ex) {
- if (!authenticationMethod.writeLoginResponse(request,
response, ex)) {
- writeLoginResponse(request, response, ex);
- }
- return;
}
Set<Principal> principals = subject.getPrincipals();