Author: rjung Date: Wed Nov 26 17:55:45 2014 New Revision: 1641871 URL: http://svn.apache.org/r1641871 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52488 s/exipre/expire/g
Backport of r1233433 from TC6. Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=1641871&r1=1641870&r2=1641871&view=diff ============================================================================== --- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Wed Nov 26 17:55:45 2014 @@ -31,6 +31,10 @@ <body> <section name="Tomcat OACC 0.1 (rjung)"> <subsection name="Cluster"> + <fix> + <bug>52488</bug>: Correct typos: exipre -> expire. Based on a patch by + prockter. (markt) + </fix> <add> When Context manager does not exist, no context manager message is replied in order to avoid timeout (default 60 sec) of Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=1641871&r1=1641870&r2=1641871&view=diff ============================================================================== --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java Wed Nov 26 17:55:45 2014 @@ -1492,7 +1492,7 @@ public class DeltaManager extends Cluste } /** - * Exipre all find sessions. + * Expire all find sessions. */ public void expireAllLocalSessions() { @@ -1516,7 +1516,7 @@ public class DeltaManager extends Cluste }//end if }//for long timeEnd = System.currentTimeMillis(); - if(log.isDebugEnabled()) log.debug("End expire sessions " + getName() + " exipre processingTime " + (timeEnd - timeNow) + " expired direct sessions: " + expireDirect + " expired direct sessions: " + expireIndirect); + if(log.isDebugEnabled()) log.debug("End expire sessions " + getName() + " expire processingTime " + (timeEnd - timeNow) + " expired direct sessions: " + expireDirect + " expired direct sessions: " + expireIndirect); } Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml?rev=1641871&r1=1641870&r2=1641871&view=diff ============================================================================== --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml Wed Nov 26 17:55:45 2014 @@ -308,7 +308,7 @@ <attribute name="expireSessionsOnShutdown" is="true" - description="exipre all sessions cluster wide as one node goes down" + description="expire all sessions cluster wide as one node goes down" type="boolean" /> <attribute name="notifyListenersOnReplication" --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org