From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 20 Oct 2010 19:26:05 +0000 (+0000)
Subject: Clean-up
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=1aa12b9aebaa293d187145012c7d784b64d7df4e;p=tomcat7.0

Clean-up

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1025684 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 5f858cb99..495123649 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -596,6 +596,7 @@ public abstract class AuthenticatorBase extends ValveBase
      *
      * @exception IOException if an input/output error occurs
      */
+    @Override
     public abstract boolean authenticate(Request request,
                                             HttpServletResponse response,
                                             LoginConfig config)
@@ -829,6 +830,7 @@ public abstract class AuthenticatorBase extends ValveBase
 
     }
 
+    @Override
     public void login(String username, String password, Request request)
             throws ServletException {
         Principal principal = doLogin(request, username, password);
@@ -847,6 +849,7 @@ public abstract class AuthenticatorBase extends ValveBase
         return p;
     }
 
+    @Override
     public void logout(Request request) throws ServletException {
         register(request, request.getResponse(), null,
                 null, null, null);
diff --git a/java/org/apache/catalina/authenticator/SingleSignOn.java b/java/org/apache/catalina/authenticator/SingleSignOn.java
index c1b7b69d0..22dfed635 100644
--- a/java/org/apache/catalina/authenticator/SingleSignOn.java
+++ b/java/org/apache/catalina/authenticator/SingleSignOn.java
@@ -210,6 +210,7 @@ public class SingleSignOn extends ValveBase implements SessionListener {
      *
      * @param event SessionEvent that has occurred
      */
+    @Override
     public void sessionEvent(SessionEvent event) {
 
         // We only care about session destroyed events
diff --git a/java/org/apache/catalina/authenticator/SingleSignOnEntry.java b/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
index cb2526b0e..6ea1150b9 100644
--- a/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
+++ b/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
@@ -62,11 +62,8 @@ public class SingleSignOnEntry
      */
     public SingleSignOnEntry(Principal principal, String authType,
                              String username, String password) {
-        super();
-        updateCredentials(principal, authType, username, password);
-    }
 
-    public SingleSignOnEntry() {
+        updateCredentials(principal, authType, username, password);
     }
 
     // ------------------------------------------------------- Package Methods