Author: remm
Date: Mon Dec 3 16:52:34 2018
New Revision: 1848069
URL: http://svn.apache.org/viewvc?rev=1848069&view=rev
Log:
Add session not found message, and some cleanup.
Modified:
tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=1848069&r1=1848068&r2=1848069&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
[UTF-8] Mon Dec 3 16:52:34 2018
@@ -38,6 +38,7 @@ managerBase.contextNull=The Context must
managerBase.createSession.ise=createSession: Too many active sessions
managerBase.sessionAttributeNameFilter=Skipped session attribute named [{0}]
because it did not match the name filter [{1}]
managerBase.sessionAttributeValueClassNameFilter=Skipped session attribute
named [{0}] because the value type [{1}] did not match the filter [{2}]
+managerBase.sessionNotFound=The session [{0}] was not found
managerBase.sessionTimeout=Invalid session timeout setting [{0}]
managerBase.setContextNotNew=It is illegal to call setContext() to change the
Context associated with a Manager if the Manager is not in the NEW state
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1848069&r1=1848068&r2=1848069&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Mon Dec 3
16:52:34 2018
@@ -1115,9 +1115,10 @@ public abstract class ManagerBase extend
*/
public String getSessionAttribute( String sessionId, String key ) {
Session s = sessions.get(sessionId);
- if( s==null ) {
- if(log.isInfoEnabled())
- log.info("Session not found " + sessionId);
+ if (s == null) {
+ if (log.isInfoEnabled()) {
+ log.info(sm.getString("managerBase.sessionNotFound",
sessionId));
+ }
return null;
}
Object o=s.getSession().getAttribute(key);
@@ -1142,7 +1143,7 @@ public abstract class ManagerBase extend
Session s = sessions.get(sessionId);
if (s == null) {
if (log.isInfoEnabled()) {
- log.info("Session not found " + sessionId);
+ log.info(sm.getString("managerBase.sessionNotFound",
sessionId));
}
return null;
}
@@ -1163,63 +1164,79 @@ public abstract class ManagerBase extend
public void expireSession( String sessionId ) {
- Session s=sessions.get(sessionId);
- if( s==null ) {
- if(log.isInfoEnabled())
- log.info("Session not found " + sessionId);
+ Session s = sessions.get(sessionId);
+ if (s == null) {
+ if (log.isInfoEnabled()) {
+ log.info(sm.getString("managerBase.sessionNotFound",
sessionId));
+ }
return;
}
s.expire();
}
public long getThisAccessedTimestamp( String sessionId ) {
- Session s=sessions.get(sessionId);
- if(s== null)
- return -1 ;
+ Session s = sessions.get(sessionId);
+ if (s == null) {
+ if (log.isInfoEnabled()) {
+ log.info(sm.getString("managerBase.sessionNotFound",
sessionId));
+ }
+ return -1;
+ }
return s.getThisAccessedTime();
}
public String getThisAccessedTime( String sessionId ) {
- Session s=sessions.get(sessionId);
- if( s==null ) {
- if(log.isInfoEnabled())
- log.info("Session not found " + sessionId);
+ Session s = sessions.get(sessionId);
+ if (s == null) {
+ if (log.isInfoEnabled()) {
+ log.info(sm.getString("managerBase.sessionNotFound",
sessionId));
+ }
return "";
}
return new Date(s.getThisAccessedTime()).toString();
}
public long getLastAccessedTimestamp( String sessionId ) {
- Session s=sessions.get(sessionId);
- if(s== null)
- return -1 ;
+ Session s = sessions.get(sessionId);
+ if (s == null) {
+ if (log.isInfoEnabled()) {
+ log.info(sm.getString("managerBase.sessionNotFound",
sessionId));
+ }
+ return -1;
+ }
return s.getLastAccessedTime();
}
public String getLastAccessedTime( String sessionId ) {
- Session s=sessions.get(sessionId);
- if( s==null ) {
- if(log.isInfoEnabled())
- log.info("Session not found " + sessionId);
+ Session s = sessions.get(sessionId);
+ if (s == null) {
+ if (log.isInfoEnabled()) {
+ log.info(sm.getString("managerBase.sessionNotFound",
sessionId));
+ }
return "";
}
return new Date(s.getLastAccessedTime()).toString();
}
public String getCreationTime( String sessionId ) {
- Session s=sessions.get(sessionId);
- if( s==null ) {
- if(log.isInfoEnabled())
- log.info("Session not found " + sessionId);
+ Session s = sessions.get(sessionId);
+ if (s == null) {
+ if (log.isInfoEnabled()) {
+ log.info(sm.getString("managerBase.sessionNotFound",
sessionId));
+ }
return "";
}
return new Date(s.getCreationTime()).toString();
}
public long getCreationTimestamp( String sessionId ) {
- Session s=sessions.get(sessionId);
- if(s== null)
- return -1 ;
+ Session s = sessions.get(sessionId);
+ if (s == null) {
+ if (log.isInfoEnabled()) {
+ log.info(sm.getString("managerBase.sessionNotFound",
sessionId));
+ }
+ return -1;
+ }
return s.getCreationTime();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
