You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kf...@apache.org on 2015/11/25 09:41:14 UTC
svn commit: r1716328 - in
/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis:
AbstractReplicatedMap.java LocalStrings.properties
Author: kfujino
Date: Wed Nov 25 08:41:14 2015
New Revision: 1716328
URL: http://svn.apache.org/viewvc?rev=1716328&view=rev
Log:
Add null check for mapMember.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1716328&r1=1716327&r2=1716328&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Wed Nov 25 08:41:14 2015
@@ -735,6 +735,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/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties?rev=1716328&r1=1716327&r2=1716328&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties Wed Nov 25 08:41:14 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org