Author: fhanik
Date: Fri Sep 21 11:26:31 2007
New Revision: 578218
URL: http://svn.apache.org/viewvc?rev=578218&view=rev
Log:
bz http://issues.apache.org/bugzilla/show_bug.cgi?id=43435
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=578218&r1=578217&r2=578218&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Fri Sep 21 11:26:31 2007
@@ -713,6 +713,10 @@
boolean removed = false;
synchronized (mapMembers) {
removed = (mapMembers.remove(member) != null );
+ if (!removed) {
+ if (log.isDebugEnabled()) log.debug("Member["+member+"]
disappeared, but was not present in the map.");
+ return; //the member was not part of our map.
+ }
}
Iterator i = super.entrySet().iterator();
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=578218&r1=578217&r2=578218&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Sep 21 11:26:31 2007
@@ -36,6 +36,9 @@
<subsection name="Catalina">
<changelog>
<fix>
+ <bug>43435</bug>: Don't iterate and relocate sessions if they are not
part of the map.
+ </fix>
+ <fix>
<bug>43356</bug>: Keystore parameter is relative to CATALINA_BASE,
Truststore is either defined as parameter, javax.net.ssl.trustStore or
if empty
defaults to the keystore.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
