Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 44693 invoked from network); 17 Jan 2008 08:49:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Jan 2008 08:49:14 -0000 Received: (qmail 90740 invoked by uid 500); 17 Jan 2008 08:49:00 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 90686 invoked by uid 500); 17 Jan 2008 08:49:00 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 90675 invoked by uid 500); 17 Jan 2008 08:49:00 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 90672 invoked by uid 99); 17 Jan 2008 08:49:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jan 2008 00:49:00 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jan 2008 08:48:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BD79D1A9838; Thu, 17 Jan 2008 00:48:46 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: tomcat-dev@jakarta.apache.org From: pero@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080117084846.BD79D1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ + + Set correct StandardManager.sessionCounter after reload/restart. (pero) + 42503: 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