tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r612761 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/session/StandardManager.java webapps/docs/changelog.xml
Date Thu, 17 Jan 2008 08:48:45 GMT
Author: pero
Date: Thu Jan 17 00:48:45 2008
New Revision: 612761

URL: http://svn.apache.org/viewvc?rev=612761&view=rev
Log:
Set correct StandardManager.sessionCounter after reload!

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=612761&r1=612760&r2=612761&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 17 00:48:45 2008
@@ -41,11 +41,6 @@
   +1: fhanik, markt, pero
   -1: 
 
-* Set correct sessionCounter at StandardManager after reload sessions
-  http://svn.apache.org/viewvc?view=rev&revision=612455
-  +1: pero, fhanik, markt
-  -1: 
-
 * Improve release note wording on Java version
   http://svn.apache.org/viewvc?rev=612588&view=rev
   +1: markt, pero

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java?rev=612761&r1=612760&r2=612761&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java Thu Jan 17
00:48:45 2008
@@ -395,9 +395,10 @@
                     session.setManager(this);
                     sessions.put(session.getIdInternal(), session);
                     session.activate();
+                    sessionCounter++;
                 }
             } catch (ClassNotFoundException e) {
-              log.error(sm.getString("standardManager.loading.cnfe", e), e);
+                log.error(sm.getString("standardManager.loading.cnfe", e), e);
                 if (ois != null) {
                     try {
                         ois.close();
@@ -408,7 +409,7 @@
                 }
                 throw e;
             } catch (IOException e) {
-              log.error(sm.getString("standardManager.loading.ioe", e), e);
+                log.error(sm.getString("standardManager.loading.ioe", e), e);
                 if (ois != null) {
                     try {
                         ois.close();

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=612761&r1=612760&r2=612761&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jan 17 00:48:45 2008
@@ -91,6 +91,9 @@
   </subsection>
   <subsection name="Catalina">
     <changelog>
+       <fix>
+         Set correct StandardManager.sessionCounter after reload/restart. (pero)
+      </fix>
       <fix>
         <bug>42503</bug>: ServletContext.getResourceAsStream() could return
         stale data. Patch provided by Arvind Srinivasan. (funkman/jim)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message