Author: pero
Date: Sun Jan 20 01:58:17 2008
New Revision: 613527

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

Modified:
    
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardManager.java
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardManager.java?rev=613527&r1=613526&r2=613527&view=diff
==============================================================================
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardManager.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardManager.java
 Sun Jan 20 01:58:17 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/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=613527&r1=613526&r2=613527&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan 20 01:58:17 2008
@@ -94,6 +94,9 @@
   <subsection name="Catalina">
     <changelog>
       <fix>
+        Set correct sessionCounter at StandardManager after reload sessions. 
(pero)
+      </fix>
+      <fix>
        Fix NPE situation at AccessLogValve (pero)
       </fix>
       <fix>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to