On 25/11/2015 08:40, kfuj...@apache.org wrote: > Author: kfujino > Date: Wed Nov 25 08:40:23 2015 > New Revision: 1716327 > > URL: http://svn.apache.org/viewvc?rev=1716327&view=rev > Log: > Add null check for mapMember.
This appears to create problems when the BackupManager membership is configured using static membership. The static members are not visible to the Channel (they are managed by the Interceptor) so this test always fails and the logs fill with warnings very quickly. Mark > > Modified: > > tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java > tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties > > Modified: > tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1716327&r1=1716326&r2=1716327&view=diff > ============================================================================== > --- > tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java > (original) > +++ > tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java > Wed Nov 25 08:40:23 2015 > @@ -734,6 +734,10 @@ public abstract class AbstractReplicated > boolean memberAdded = false; > //select a backup node if we don't have one > Member mapMember = getChannel().getMember(member); > + if (mapMember == null) { > + > log.warn(sm.getString("abstractReplicatedMap.mapMemberAdded.nullMember", > member)); > + return; > + } > synchronized (mapMembers) { > if (!mapMembers.containsKey(mapMember) ) { > mapMembers.put(mapMember, > Long.valueOf(System.currentTimeMillis())); > > Modified: > tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties?rev=1716327&r1=1716326&r2=1716327&view=diff > ============================================================================== > --- > tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties > (original) > +++ > tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties > Wed Nov 25 08:40:23 2015 > @@ -34,6 +34,7 @@ abstractReplicatedMap.unable.retrieve=Un > abstractReplicatedMap.unable.get=Unable to replicate out data for a > AbstractReplicatedMap.get operation > abstractReplicatedMap.unable.put=Unable to replicate out data for a > AbstractReplicatedMap.put operation > abstractReplicatedMap.unsupport.operation=This operation is not valid on a > replicated map > +abstractReplicatedMap.mapMemberAdded.nullMember=Notified member is not > registered in the membership:{0}. > mapMessage.deserialize.error.key=Deserialization error of the MapMessage.key > mapMessage.deserialize.error.value=Deserialization error of the > MapMessage.value > lazyReplicatedMap.unableReplicate.backup=Unable to replicate backup key:{0} > to backup:{1}. Reason:{2} > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
