Am 15. September 2015 23:10:30 MESZ, schrieb ma...@apache.org:
>Author: markt
>Date: Tue Sep 15 21:10:30 2015
>New Revision: 1703290
>
>URL: http://svn.apache.org/r1703290
>Log:
>Follow-up to r1703177.
>Ensure that members never contains an intermediate result of the
>sorting process.
>
>Modified:
>tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
>
>Modified:
>tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
>URL:
>http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java?rev=1703290&r1=1703289&r2=1703290&view=diff
>==============================================================================
>---
>tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
>(original)
>+++
>tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
>Tue Sep 15 21:10:30 2015
...
>@@ -247,15 +250,13 @@ public class Membership implements Clone
> Member[] members = this.members;
> if (members.length > 0) {
> Member result = null;
result is not really used anymore and can be removed (see below).
>- for (int i = 0; i < members.length && result == null; i++)
>{
>+ for (int i = 0; i < members.length; i++) {
> if (members[i].equals(mbr)) {
>- result = members[i];
>+ return result;
return members[i], since result is not assigned a valid value and will still be
null. (And now result is really not used any more :)
Regards,
Felix
> }
> }
>- return result;
>- } else {
>- return null;
> }
>+ return null;
> }
>
> public boolean contains(Member mbr) {
>
>
>
>---------------------------------------------------------------------
>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
