aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2012-11-21 11:19:45 (EST)
committerThomas Becker2012-11-21 11:19:45 (EST)
commit795720759c7f72fb4867600ff9c9caa9052885a8 (patch)
treef1b05e37cd1d6e06e1ba2c69f945244aa277cdc3
parenta822cde5e92fcb2949630a1b705ac260b7928ff8 (diff)
downloadorg.eclipse.jetty.project-795720759c7f72fb4867600ff9c9caa9052885a8.zip
org.eclipse.jetty.project-795720759c7f72fb4867600ff9c9caa9052885a8.tar.gz
org.eclipse.jetty.project-795720759c7f72fb4867600ff9c9caa9052885a8.tar.bz2
Revert "Make JAASLoginService log LoginExceptions in DEBUG only and other exceptions in info"
-rw-r--r--jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASLoginService.java27
1 files changed, 21 insertions, 6 deletions
diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASLoginService.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASLoginService.java
index 08f8d86..d7f1f48 100644
--- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASLoginService.java
+++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASLoginService.java
@@ -209,7 +209,7 @@ public class JAASLoginService extends AbstractLifeCycle implements LoginService
}
else if (callback instanceof RequestParameterCallback)
{
- HttpChannel channel = HttpChannel.getCurrentHttpChannel();
+ HttpChannel channel = HttpChannel.getCurrentHttpChannel();
if (channel == null)
return;
@@ -245,14 +245,29 @@ public class JAASLoginService extends AbstractLifeCycle implements LoginService
return _identityService.newUserIdentity(subject,userPrincipal,getGroups(subject));
}
- catch (LoginException | UnsupportedCallbackException e)
+ catch (LoginException e)
+ {
+ LOG.warn(e);
+ }
+ catch (IOException e)
{
- LOG.debug(e);
+ LOG.warn(e);
+ }
+ catch (UnsupportedCallbackException e)
+ {
+ LOG.warn(e);
}
- catch (IOException | InstantiationException | IllegalAccessException | ClassNotFoundException e)
+ catch (InstantiationException e)
{
- LOG.info(e.getMessage());
- LOG.debug(e);
+ LOG.warn(e);
+ }
+ catch (IllegalAccessException e)
+ {
+ LOG.warn(e);
+ }
+ catch (ClassNotFoundException e)
+ {
+ LOG.warn(e);
}
return null;
}