Author: kfujino Date: Tue Apr 12 07:10:21 2016 New Revision: 1738708 URL: http://svn.apache.org/viewvc?rev=1738708&view=rev Log: Fix potential NPE that depends on the setting order of attributes of static member when using the static cluster.
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1738708&r1=1738707&r2=1738708&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Tue Apr 12 07:10:21 2016 @@ -48,7 +48,7 @@ public class MemberImpl implements Membe /** * The listen host for this member */ - protected volatile byte[] host; + protected volatile byte[] host = new byte[0]; protected transient volatile String hostname; /** * The tcp listen port for this member Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1738708&r1=1738707&r2=1738708&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Apr 12 07:10:21 2016 @@ -208,6 +208,10 @@ <add> Add the flag indicating that member is a localMember. (kfujino) </add> + <fix> + Fix potential NPE that depends on the setting order of attributes of + static member when using the static cluster. (kfujino) + </fix> </changelog> </subsection> <subsection name="Other"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org