Author: markt
Date: Tue Dec 16 21:54:53 2014
New Revision: 1646106
URL: http://svn.apache.org/r1646106
Log:
Complete the logging TODOs
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties?rev=1646106&r1=1646105&r2=1646106&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
Tue Dec 16 21:54:53 2014
@@ -31,6 +31,13 @@ formAuthenticator.forwardLoginFail=Unexp
formAuthenticator.noErrorPage=No error page was defined for FORM
authentication in context [{0}]
formAuthenticator.noLoginPage=No login page was defined for FORM
authentication in context [{0}]
+singleSignOn.sessionExpire.engineNull=Unable to expire session [{0}] because
the Engine was null
+singleSignOn.sessionExpire.hostNotFound=Unable to expire session [{0}] because
the Host could not be found
+singleSignOn.sessionExpire.contextNotFound=Unable to expire session [{0}]
because the Context could not be found
+singleSignOn.sessionExpire.managerNotFound=Unable to expire session [{0}]
because the Manager could not be found
+singleSignOn.sessionExpire.managerError=Unable to expire session [{0}] because
the Manager threw an Exception when searching for the session
+singleSignOn.sessionExpire.sessionNotFound=Unable to expire session [{0}]
because the Session could not be found
+
spnegoAuthenticator.authHeaderNoToken=The Negotiate authorization header sent
by the client did not include a token
spnegoAuthenticator.authHeaderNotNego=The authorization header sent by the
client did not start with Negotiate
spnegoAuthenticator.serviceLoginFail=Unable to login as the service principal
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1646106&r1=1646105&r2=1646106&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Tue
Dec 16 21:54:53 2014
@@ -37,6 +37,9 @@ import org.apache.catalina.SessionListen
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.valves.ValveBase;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
/**
* A <strong>Valve</strong> that supports a "single sign on" user experience,
@@ -59,6 +62,9 @@ import org.apache.catalina.valves.ValveB
*/
public class SingleSignOn extends ValveBase implements SessionListener {
+ private static final Log log = LogFactory.getLog(SingleSignOn.class);
+ private static final StringManager sm =
StringManager.getManager(SingleSignOn.class);
+
/* The engine at the top of the container hierarchy in which this SSO Valve
* has been placed. It is used to get back to a session object from a
* SingleSignOnSessionKey and is updated when the Valve starts and stops.
@@ -434,33 +440,33 @@ public class SingleSignOn extends ValveB
private void expire(SingleSignOnSessionKey key) {
if (engine == null) {
- // TODO Log error
+ log.warn(sm.getString("singleSignOn.sessionExpire.engineNull",
key));
return;
}
Container host = engine.findChild(key.getHostName());
if (host == null) {
- // TODO Log error
+ log.warn(sm.getString("singleSignOn.sessionExpire.hostNotFound",
key));
return;
}
Context context = (Context) host.findChild(key.getContextName());
if (context == null) {
- // TODO Log error
+
log.warn(sm.getString("singleSignOn.sessionExpire.contextNotFound", key));
return;
}
Manager manager = context.getManager();
if (manager == null) {
- // TODO Log error
+
log.warn(sm.getString("singleSignOn.sessionExpire.managerNotFound", key));
return;
}
Session session = null;
try {
session = manager.findSession(key.getSessionId());
} catch (IOException e) {
- // TODO Log error
+ log.warn(sm.getString("singleSignOn.sessionExpire.managerError",
key), e);
return;
}
if (session == null) {
- // TODO Log error
+
log.warn(sm.getString("singleSignOn.sessionExpire.sessionNotFound", key));
return;
}
session.expire();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
